AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent duplicate sort, order and page GET VARs in the URL when Clicking to Sort a field or Clicking a page number. We now unset the GET VAR arrays before recreating the URL GET Strings

This commit is contained in:
johnnyq 2023-07-08 14:40:00 -04:00
parent e7572c9e8f
commit 1bacabc72b
45 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
categories.php
View File

@ -13,7 +13,7 @@ if (isset($_GET['category'])) {
}
//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,

3
client_assets.php
View File

@ -52,7 +52,8 @@ if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
}
//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,

2
client_certificates.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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%')

2
client_contacts.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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

2
client_document_templates.php
View File

@ -14,7 +14,7 @@ if (!empty($q)) {
}
//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,

2
client_documents.php
View File

@ -21,7 +21,7 @@ if (!empty($q)) {
}
//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;

2
client_domains.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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%')

2
client_invoices.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_locations.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
client_logins.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
client_logs.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_payments.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_quotes.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_recurring_invoices.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_scheduled_tickets.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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(

2
client_services.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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(

2
client_shared_items.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_software.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
client_tickets.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_trips.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
client_vendors.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
clients.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
expenses.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
invoices.php
View File

@ -69,7 +69,7 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Draft') {
}
//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,

2
logs.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
notifications_dismissed.php
View File

@ -8,7 +8,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,

12
pagination.php
View File

@ -58,12 +58,16 @@ if ($total_found_rows > 10) {
} 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 @@ if ($total_found_rows > 10) {
} 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>";
}
?>

6
pagination_head.php
View File

@ -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']);

2
payments.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
quotes.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
recurring_invoices.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
revenues.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
scheduled_tickets.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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(

2
settings_api.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
settings_custom_fields.php
View File

@ -13,7 +13,7 @@ if (isset($_GET['table'])) {
}
//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,

2
settings_mail_queue.php
View File

@ -13,7 +13,7 @@ $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'htt
$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,

2
settings_software_templates.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
settings_tags.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
settings_taxes.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
settings_vendor_templates.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
transfers.php
View File

@ -6,7 +6,7 @@ $order = "DESC";
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,

2
trips.php
View File

@ -7,7 +7,7 @@ $order = "DESC";
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,

2
users.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,

2
vendors.php
View File

@ -7,7 +7,7 @@ $order = "ASC";
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,