ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stage #1

Merged
ThaMunsta merged 351 commits from stage into main 2025-11-10 14:37:21 +00:00
Conversation 1 Commits 351 Files Changed 2998
+14 -12
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a5aae51b1a - Show all commits
assets.php
+1 -1
View File
@@ -259,7 +259,7 @@ if (mysqli_num_rows($os_sql) > 0) {
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN assets ON asset_client_id = client_id JOIN assets ON asset_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
certificates.php
+1 -1
View File
@@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN certificates ON certificate_client_id = client_id JOIN certificates ON certificate_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
contacts.php
+1 -1
View File
@@ -192,7 +192,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN contacts ON contact_client_id = client_id JOIN contacts ON contact_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
credentials.php
+6 -5
View File
@@ -12,10 +12,10 @@ if (isset($_GET['client_id'])) {
// Overide Filter Header Archived // Overide Filter Header Archived
if (isset($_GET['archived']) && $_GET['archived'] == 1) { if (isset($_GET['archived']) && $_GET['archived'] == 1) {
$archived = 1; $archived = 1;
$archive_query = "c.credential_archived_at IS NOT NULL"; $archive_query = "credential_archived_at IS NOT NULL";
} else { } else {
$archived = 0; $archived = 0;
$archive_query = "c.credential_archived_at IS NULL"; $archive_query = "credential_archived_at IS NULL";
} }
// Log when users load the Credentials page // Log when users load the Credentials page
@@ -28,10 +28,10 @@ if (isset($_GET['client_id'])) {
// Overide Filter Header Archived // Overide Filter Header Archived
if (isset($_GET['archived']) && $_GET['archived'] == 1) { if (isset($_GET['archived']) && $_GET['archived'] == 1) {
$archived = 1; $archived = 1;
$archive_query = "(client_archived_at IS NOT NULL OR c.credential_archived_at IS NOT NULL)"; $archive_query = "(client_archived_at IS NOT NULL OR credential_archived_at IS NOT NULL)";
} else { } else {
$archived = 0; $archived = 0;
$archive_query = "(client_archived_at IS NULL AND c.credential_archived_at IS NULL)"; $archive_query = "(client_archived_at IS NULL AND credential_archived_at IS NULL)";
} }
// Log when users load the Credentials page // Log when users load the Credentials page
logAction("Credential", "View", "$session_name viewed the All Credentials page"); logAction("Credential", "View", "$session_name viewed the All Credentials page");
@@ -132,6 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php if ($client_url) { ?> <?php if ($client_url) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } ?> <?php } ?>
<input type="hidden" name="archived" value="<?php echo $archived; ?>">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
@@ -200,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN credentials ON credential_client_id = client_id JOIN credentials ON credential_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
domains.php
+2 -1
View File
@@ -94,6 +94,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php if ($client_url) { ?> <?php if ($client_url) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } ?> <?php } ?>
<input type="hidden" name="archived" value="<?php echo $archived; ?>">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="input-group mb-3 mb-md-0"> <div class="input-group mb-3 mb-md-0">
@@ -117,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN domains ON domain_client_id = client_id JOIN domains ON domain_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
locations.php
+1 -1
View File
@@ -151,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN locations ON location_client_id = client_id JOIN locations ON location_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
networks.php
+1 -1
View File
@@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN networks ON network_client_id = client_id JOIN networks ON network_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");
software.php
+1 -1
View File
@@ -114,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
SELECT DISTINCT client_id, client_name SELECT DISTINCT client_id, client_name
FROM clients FROM clients
JOIN software ON software_client_id = client_id JOIN software ON software_client_id = client_id
WHERE client_archived_at IS NULL WHERE $archive_query
$access_permission_query $access_permission_query
ORDER BY client_name ASC ORDER BY client_name ASC
"); ");