Dedup More Pagination code you now only have to define Sortby column …

…and its order, also fixed issue when searching by date it would close on the first query
itflow-org · Feb 25, 2023 · 6f0017d · 6f0017d
1 parent 704c8e4
commit 6f0017d
Show file tree

Hide file tree

Showing 42 changed files with 284 additions and 973 deletions.
diff --git a/accounts.php b/accounts.php
@@ -1,12 +1,10 @@
 <?php
 
-require_once("inc_all.php");
+// Default Column Sortby Filter
+$sb = "account_name";
+$o = "ASC";
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "account_name";
-}
+require_once("inc_all.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/categories.php b/categories.php
@@ -1,5 +1,9 @@
 <?php
 
+// Default Column Sortby Filter
+$sb = "category_name";
+$o = "ASC";
+
 require_once("inc_all_settings.php");
 
 if (isset($_GET['category'])) {
@@ -8,12 +12,6 @@
     $category = "Expense";
 }
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "category_name";
-}
-
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
 

diff --git a/client_assets.php b/client_assets.php
@@ -1,4 +1,9 @@
 <?php
+
+// Default Column Sortby Filter
+$sb = "asset_name";
+$o = "ASC";
+
 require_once("inc_all_client.php");
 
 //Get Asset Counts
@@ -30,12 +35,6 @@
   AND asset_archived_at IS NULL AND asset_client_id = $client_id"));
 $other_count = intval($row['count']);
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "asset_name";
-}
-
 //Asset Type from GET
 if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
     $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";

diff --git a/client_certificates.php b/client_certificates.php
@@ -1,11 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "certificate_name";
-}
+// Default Column Sortby Filter
+$sb = "certificate_name";
+$o = "ASC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_contacts.php b/client_contacts.php
@@ -1,25 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "contact_name";
+$o = "ASC";
 
-if (isset($_GET['q'])) {
-    $q = sanitizeInput($_GET['q']);
-    //Phone Numbers
-    $n = preg_replace("/[^0-9]/", '', $q);
-    if (empty($n)) {
-        $n = $q;
-    }
-} else {
-    $q = "";
-    //Phone Numbers
-    $n = "";
-}
-
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "contact_name";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_documents.php b/client_documents.php
@@ -1,5 +1,9 @@
 <?php
 
+// Default Column Sortby Filter
+$sb = "document_name";
+$o = "ASC";
+
 require_once("inc_all_client.php");
 
 // Folder
@@ -9,13 +13,6 @@
     $folder = 0;
 }
 
-// Sort by
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "document_name";
-}
-
 // Search query SQL snippet
 if (!empty($q)) {
     $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";

diff --git a/client_domains.php b/client_domains.php
@@ -1,12 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "domain_name";
+$o = "ASC";
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "domain_name";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_invoices.php b/client_invoices.php
@@ -1,17 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "invoice_number";
-}
-
-// Reverse default sort
-if (!isset($_GET['o'])) {
-    $o = "DESC";
-    $disp = "ASC";
-}
+// Default Column Sortby Filter
+$sb = "invoice_number";
+$o = "DESC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_locations.php b/client_locations.php
@@ -1,24 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "location_name";
+$o = "ASC";
 
-if (isset($_GET['q'])) {
-    $q = sanitizeInput($_GET['q']);
-    //Phone Numbers
-    $phone_query = preg_replace("/[^0-9]/", '', $q);
-    if (empty($phone_query)) {
-        $phone_query = $q;
-    }
-} else {
-    $q = "";
-    $phone_query = "";
-}
-
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "location_name";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
@@ -29,7 +15,8 @@
     WHERE location_client_id = $client_id
     AND location_archived_at IS NULL
     AND (location_name LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') 
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 

diff --git a/client_logs.php b/client_logs.php
@@ -1,17 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "log_id";
-}
-
-// Reverse default sort
-if (!isset($_GET['o'])) {
-    $o = "DESC";
-    $disp = "ASC";
-}
+// Default Column Sortby Filter
+$sb = "log_id";
+$o = "DESC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_networks.php b/client_networks.php
@@ -1,11 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "network_name";
-}
+// Default Column Sortby Filter
+$sb = "network_name";
+$o = "ASC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_payments.php b/client_payments.php
@@ -1,17 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "payment_date";
-}
-
-// Reverse default sort
-if (!isset($_GET['o'])) {
-    $o = "DESC";
-    $disp = "ASC";
-}
+// Default Column Sortby Filter
+$sb = "payment_date";
+$o = "DESC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_quotes.php b/client_quotes.php
@@ -1,18 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "quote_number";
+$o = "DESC";
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "quote_number";
-}
-
-// Reverse default sort
-if (!isset($_GET['o'])) {
-    $o = "DESC";
-    $disp = "ASC";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
@@ -1,12 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "recurring_last_sent";
+$o = "DESC";
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "recurring_id";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_services.php b/client_services.php
@@ -1,12 +1,10 @@
 <?php
 
-require_once("inc_all_client.php");
+// Default Column Sortby Filter
+$sb = "service_name";
+$o = "ASC";
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "service_name";
-}
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));

diff --git a/client_shared_items.php b/client_shared_items.php
@@ -1,20 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (isset($_GET['q'])) {
-    $q = sanitizeInput($_GET['q']);
-    //Phone Numbers
-    $phone_query = preg_replace("/[^0-9]/", '', $q);
-    if (empty($phone_query)) {
-        $phone_query = $q;
-    }
-} else {
-    $q = "";
-    $phone_query = "";
-}
-
-// Sort
+// Default Column Sortby Filter
 $sb = "item_created_at";
+$o = "DESC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
@@ -44,7 +34,7 @@
 
                     <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 strip_tags(htmlentities($q)); } ?>" placeholder="Search Shared Items">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(htmlentities($q)); } ?>" placeholder="Search Shared Items">
                             <div class="input-group-append">
                                 <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                             </div>

diff --git a/client_software.php b/client_software.php
@@ -1,11 +1,10 @@
 <?php
-require_once("inc_all_client.php");
 
-if (!empty($_GET['sb'])) {
-    $sb = sanitizeInput($_GET['sb']);
-} else {
-    $sb = "software_name";
-}
+// Default Column Sortby Filter
+$sb = "software_name";
+$o = "ASC";
+
+require_once("inc_all_client.php");
 
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));