Prevent duplicate sort, order and page GET VARs in the URL when Click…

…ing to Sort a field or Clicking a page number. We now unset the GET VAR arrays before recreating the URL GET Strings
itflow-org · Jul 8, 2023 · 1bacabc · 1bacabc
1 parent e7572c9
commit 1bacabc
Show file tree

Hide file tree

Showing 45 changed files with 58 additions and 47 deletions.
diff --git a/accounts.php b/accounts.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/categories.php b/categories.php
@@ -13,7 +13,7 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_assets.php b/client_assets.php
@@ -52,7 +52,8 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+//Rebuild URL
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_certificates.php b/client_certificates.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates 
   WHERE certificate_client_id = $client_id AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') 

diff --git a/client_contacts.php b/client_contacts.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM contacts 
     LEFT JOIN locations ON location_id = contact_location_id

diff --git a/client_document_templates.php b/client_document_templates.php
@@ -14,7 +14,7 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_documents.php b/client_documents.php
@@ -21,7 +21,7 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 // Folder ID
 $get_folder_id = 0;

diff --git a/client_domains.php b/client_domains.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM domains LEFT JOIN vendors ON domain_registrar = vendor_id
   WHERE domain_client_id = $client_id AND (domain_name LIKE '%$q%' OR vendor_name LIKE '%$q%') 

diff --git a/client_invoices.php b/client_invoices.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_locations.php b/client_locations.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_logins.php b/client_logins.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_logs.php b/client_logs.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_payments.php b/client_payments.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_quotes.php b/client_quotes.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_scheduled_tickets.php b/client_scheduled_tickets.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 // SQL
 $sql = mysqli_query(

diff --git a/client_services.php b/client_services.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 // Overview SQL query
 $sql = mysqli_query(

diff --git a/client_shared_items.php b/client_shared_items.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_software.php b/client_software.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_tickets.php b/client_tickets.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_trips.php b/client_trips.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/client_vendors.php b/client_vendors.php
@@ -7,7 +7,7 @@
 require_once("inc_all_client.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/clients.php b/clients.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/expenses.php b/expenses.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/invoices.php b/invoices.php
@@ -69,7 +69,7 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/logs.php b/logs.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/notifications_dismissed.php b/notifications_dismissed.php
@@ -8,7 +8,7 @@
 
 //Rebuild URL
 
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/pagination.php b/pagination.php
@@ -58,12 +58,16 @@
                 } else {
                     $next_class = "disabled";
                 }
-                $url_query_strings = http_build_query(array_merge($_GET, array('page' => $i)));
+                $get_copy = $_GET; // create a copy of the $_GET array
+                //unset($get_copy['page']);
+                // Unset Array Var to prevent Duplicate Get VARs
+                unset($get_copy['page']); 
+                $url_query_strings_page = http_build_query($get_copy);
                 $prev_page = $page - 1;
                 $next_page  = $page + 1;
 
                 if ($page > 1) {
-                    echo "<li class='page-item $prev_class'><a class='page-link' href='?$url_query_strings&page=$prev_page'>Prev</a></li>";
+                    echo "<li class='page-item $prev_class'><a class='page-link' href='?$url_query_strings_page&page=$prev_page'>Prev</a></li>";
                 }
 
                 while ($i < $total_pages) {
@@ -74,12 +78,12 @@
                         } else {
                             $page_class = "";
                         }
-                        echo "<li class='page-item $page_class'><a class='page-link' href='?$url_query_strings&page=$i'>$i</a></li>";
+                        echo "<li class='page-item $page_class'><a class='page-link' href='?$url_query_strings_page&page=$i'>$i</a></li>";
                     }
                 }
 
                 if ($page <> $total_pages) {
-                    echo "<li class='page-item $next_class'><a class='page-link' href='?$url_query_strings&page=$next_page'>Next</a></li>";
+                    echo "<li class='page-item $next_class'><a class='page-link' href='?$url_query_strings_page&page=$next_page'>Next</a></li>";
                 }
 
                 ?>

diff --git a/pagination_head.php b/pagination_head.php
@@ -7,6 +7,12 @@
  * Should not be accessed directly, but called from other pages
  */
 
+// Unset Array Var to prevent Duplicate Get VARs
+$get_copy = $_GET; // create a copy of the $_GET array
+//unset($get_copy['page']);
+unset($get_copy['sort']);
+unset($get_copy['order']); 
+
 // Paging
 if (isset($_GET['page'])) {
     $page = intval($_GET['page']);

diff --git a/payments.php b/payments.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/quotes.php b/quotes.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/recurring_invoices.php b/recurring_invoices.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/revenues.php b/revenues.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/scheduled_tickets.php b/scheduled_tickets.php
@@ -7,7 +7,7 @@
 require_once("inc_all.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 // SQL
 $sql = mysqli_query(

diff --git a/settings_api.php b/settings_api.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/settings_custom_fields.php b/settings_custom_fields.php
@@ -13,7 +13,7 @@
 }
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/settings_mail_queue.php b/settings_mail_queue.php
@@ -13,7 +13,7 @@
 $purifier = new HTMLPurifier($purifier_config);
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/settings_software_templates.php b/settings_software_templates.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/settings_tags.php b/settings_tags.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,

diff --git a/settings_taxes.php b/settings_taxes.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli, 

diff --git a/settings_vendor_templates.php b/settings_vendor_templates.php
@@ -7,7 +7,7 @@
 require_once("inc_all_settings.php");
 
 //Rebuild URL
-$url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order)));
+$url_query_strings_sort = http_build_query($get_copy);
 
 $sql = mysqli_query(
     $mysqli,