diff --git a/client_certificates.php b/certificates.php similarity index 86% rename from client_certificates.php rename to certificates.php index 3f874e37..430ae5c0 100644 --- a/client_certificates.php +++ b/certificates.php @@ -4,7 +4,16 @@ $sort = "certificate_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND certificate_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); @@ -12,11 +21,13 @@ enforceUserPermission('module_support'); //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates - WHERE certificate_archived_at IS NULL - AND certificate_client_id = $client_id - AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') - ORDER BY $sort $order LIMIT $record_from, $record_to"); +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM certificates + LEFT JOIN clients ON client_id = certificate_client_id + WHERE certificate_archived_at IS NULL + AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%' OR client_name LIKE '%$q%') + $client_query + ORDER BY $sort $order LIMIT $record_from, $record_to" +); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -41,7 +52,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ +
@@ -105,6 +118,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Expire + + + + Client + + + Action @@ -112,6 +132,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + + +
diff --git a/contacts.php b/contacts.php index 1baf2383..607268e6 100644 --- a/contacts.php +++ b/contacts.php @@ -66,7 +66,7 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, clients.*, LEFT JOIN tags ON tags.tag_id = contact_tags.tag_id WHERE contact_$archive_query $tag_query - AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_email LIKE '%$q%' OR contact_department LIKE '%$q%' OR contact_phone LIKE '%$phone_query%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$phone_query%' OR tag_name LIKE '%$q%') + AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_email LIKE '%$q%' OR contact_department LIKE '%$q%' OR contact_phone LIKE '%$phone_query%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$phone_query%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') $client_query $location_query GROUP BY contact_id @@ -263,7 +263,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Location - + Client diff --git a/client_logins.php b/credentials.php similarity index 84% rename from client_logins.php rename to credentials.php index f7eaa029..dae96154 100644 --- a/client_logins.php +++ b/credentials.php @@ -4,14 +4,24 @@ $sort = "login_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND login_client_id = $client_id"; + $client_url = "client_id=$client_id&"; + // Log when users load the Credentials/Logins page + logAction("Credential", "View", "$session_name viewed the Credentials page for client", $client_id); +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; + // Log when users load the Credentials/Logins page + logAction("Credential", "View", "$session_name viewed the All Credentials page"); +} // Perms enforceUserPermission('module_credential'); -// Log when users load the Credentials/Logins page -mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Credential', log_action = 'View', log_description = '$session_name viewed the Credentials page for client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); - // Tags Filter if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { // Sanitize each element of the status array @@ -28,34 +38,46 @@ if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { $tag_query = ''; } -// Location Filter -if (isset($_GET['location']) & !empty($_GET['location'])) { - $location_query = 'AND (a.asset_location_id = ' . intval($_GET['location']) . ')'; - $location_query_innerjoin = 'INNER JOIN assets a on a.asset_id = l.login_asset_id '; - $location_filter = intval($_GET['location']); -} else { - // Default - any - $location_query_innerjoin = ''; - $location_query = ''; - $location_filter = ''; +if (!$client_url) { + // Client Filter + if (isset($_GET['client']) & !empty($_GET['client'])) { + $client_query = 'AND (login_client_id = ' . intval($_GET['client']) . ')'; + $client = intval($_GET['client']); + } else { + // Default - any + $client_query = ''; + $client = ''; + } } - -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); +if ($client_url) { + // Location Filter + if (isset($_GET['location']) & !empty($_GET['location'])) { + $location_query = 'AND (a.asset_location_id = ' . intval($_GET['location']) . ')'; + $location_query_innerjoin = 'INNER JOIN assets a on a.asset_id = l.login_asset_id '; + $location_filter = intval($_GET['location']); + } else { + // Default - any + $location_query_innerjoin = ''; + $location_query = ''; + $location_filter = ''; + } +} $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS l.login_id AS l_login_id, l.*, login_tags.*, tags.* + "SELECT SQL_CALC_FOUND_ROWS l.login_id AS l_login_id, l.*, login_tags.*, tags.*, clients.* FROM logins l LEFT JOIN login_tags ON login_tags.login_id = l.login_id LEFT JOIN tags ON tags.tag_id = login_tags.tag_id + LEFT JOIN clients ON client_id = login_client_id $location_query_innerjoin - WHERE l.login_client_id = $client_id + WHERE l.login_$archive_query $tag_query - AND l.login_$archive_query - AND (l.login_name LIKE '%$q%' OR l.login_description LIKE '%$q%' OR l.login_uri LIKE '%$q%' OR tag_name LIKE '%$q%') + AND (l.login_name LIKE '%$q%' OR l.login_description LIKE '%$q%' OR l.login_uri LIKE '%$q%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') $location_query + $client_query + GROUP BY l.login_id ORDER BY l.login_important DESC, $sort $order LIMIT $record_from, $record_to" ); @@ -91,7 +113,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ +
@@ -102,7 +126,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + +
+ +
+
+ +
+
+
@@ -141,7 +187,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- "> Archived @@ -204,6 +250,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + + + Client + + + Action @@ -211,6 +264,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
@@ -336,6 +395,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ + +
@@ -366,7 +428,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + data-ajax-id="" + > Edit
@@ -406,7 +469,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + @@ -414,15 +477,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + - +
+ +
diff --git a/global_search.php b/global_search.php index be3c1693..a7130489 100644 --- a/global_search.php +++ b/global_search.php @@ -141,22 +141,22 @@ if (isset($_GET['query'])) { ?> - -
-
-

Global Search

-
+
+
+

Global Search

+
+
0) { ?>
-
+
-
Clients
+
Clients
@@ -196,9 +196,9 @@ if (isset($_GET['query'])) {
-
+
-
Contacts
+
Contacts
@@ -252,9 +252,9 @@ if (isset($_GET['query'])) {
-
+
-
Vendors
+
Vendors
@@ -299,9 +299,9 @@ if (isset($_GET['query'])) {
-
+
-
Domains
+
Domains
@@ -343,9 +343,9 @@ if (isset($_GET['query'])) {
-
+
-
Products
+
Products
@@ -382,9 +382,9 @@ if (isset($_GET['query'])) {
-
+
-
Documents
+
Documents
@@ -426,9 +426,9 @@ if (isset($_GET['query'])) {
-
+
-
Files
+
Files
@@ -476,9 +476,9 @@ if (isset($_GET['query'])) {
-
+
-
Tickets
+
Tickets
@@ -526,9 +526,9 @@ if (isset($_GET['query'])) {
-
+
-
Recurring Tickets
+
Recurring Tickets
@@ -575,9 +575,9 @@ if (isset($_GET['query'])) {
-
+
-
Credentials
+

Credentials

@@ -604,12 +604,12 @@ if (isset($_GET['query'])) { ?> - + - + @@ -628,9 +628,9 @@ if (isset($_GET['query'])) {
-
+
-
Invoices
+
Invoices
@@ -679,9 +679,9 @@ if (isset($_GET['query'])) {
-
+
-
Assets
+
Assets
@@ -771,9 +771,9 @@ if (isset($_GET['query'])) {
-
+
-
Ticket Replies
+
Ticket Replies
@@ -838,11 +838,16 @@ if (isset($_GET['query'])) {
+
+ + + + ALL Domains

+
  • + "> + +

    ALL Licenses

    +     +
    • +
  • + "> + +

    ALL Credentials

    +     +
    • +
  • + "> + +

    ALL Certificates

    +     +
    • diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 2667e168..a24a83a8 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -129,7 +129,7 @@
  • - "> + ">

    Licenses @@ -142,7 +142,7 @@

  • - "> + ">

    Credentials @@ -181,7 +181,7 @@

  • - "> + ">

    Certificates diff --git a/js/logins_show_otp_via_id.js b/js/credential_show_otp_via_id.js similarity index 100% rename from js/logins_show_otp_via_id.js rename to js/credential_show_otp_via_id.js diff --git a/js/logins_generate_password.js b/js/generate_password.js similarity index 100% rename from js/logins_generate_password.js rename to js/generate_password.js diff --git a/modals/client_certificate_add_modal.php b/modals/certificate_add_modal.php similarity index 100% rename from modals/client_certificate_add_modal.php rename to modals/certificate_add_modal.php diff --git a/modals/client_certificate_export_modal.php b/modals/certificate_export_modal.php similarity index 79% rename from modals/client_certificate_export_modal.php rename to modals/certificate_export_modal.php index 0c0b0077..632312cb 100644 --- a/modals/client_certificate_export_modal.php +++ b/modals/certificate_export_modal.php @@ -8,12 +8,14 @@ + +

    - +
    diff --git a/modals/client_login_add_modal.php b/modals/credential_add_modal.php similarity index 89% rename from modals/client_login_add_modal.php rename to modals/credential_add_modal.php index 1cf2364c..e9a64b93 100644 --- a/modals/client_login_add_modal.php +++ b/modals/credential_add_modal.php @@ -8,7 +8,6 @@
    -
    @@ -16,9 +15,11 @@
  • Details
    • +
  • Relation
    • +
  • Notes
    • @@ -30,6 +31,33 @@
    + + + + +
    + +
    +
    + +
    + +
    +
    + + +
    @@ -116,6 +144,7 @@
    +
    @@ -222,6 +251,7 @@
    +
    diff --git a/modals/client_login_bulk_assign_tags_modal.php b/modals/credential_bulk_assign_tags_modal.php similarity index 100% rename from modals/client_login_bulk_assign_tags_modal.php rename to modals/credential_bulk_assign_tags_modal.php diff --git a/modals/client_login_export_modal.php b/modals/credential_export_modal.php similarity index 79% rename from modals/client_login_export_modal.php rename to modals/credential_export_modal.php index 13bb0a7e..4dbeb453 100644 --- a/modals/client_login_export_modal.php +++ b/modals/credential_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/modals/client_login_import_modal.php b/modals/credential_import_modal.php similarity index 82% rename from modals/client_login_import_modal.php rename to modals/credential_import_modal.php index 566ccdda..cdbbe15c 100644 --- a/modals/client_login_import_modal.php +++ b/modals/credential_import_modal.php @@ -8,7 +8,9 @@
    + +

    Format csv file with headings & data:
    Name, Description, Username, Password, URL

    @@ -16,10 +18,10 @@
    - +
    - +
    diff --git a/modals/client_software_add_from_template_modal.php b/modals/software_add_from_template_modal.php similarity index 100% rename from modals/client_software_add_from_template_modal.php rename to modals/software_add_from_template_modal.php diff --git a/modals/client_software_add_modal.php b/modals/software_add_modal.php similarity index 86% rename from modals/client_software_add_modal.php rename to modals/software_add_modal.php index b8eb8a66..8dc810c2 100644 --- a/modals/client_software_add_modal.php +++ b/modals/software_add_modal.php @@ -8,7 +8,6 @@ -
      @@ -18,12 +17,14 @@
    • Licensing
      • +
    • Devices
    • Users
      • +
    • Notes
      • @@ -35,6 +36,33 @@
      + + + + +
      + +
      +
      + +
      + +
      +
      + + +
      @@ -141,6 +169,8 @@
      + +
        @@ -215,6 +245,8 @@
      + +
      diff --git a/modals/client_software_export_modal.php b/modals/software_export_modal.php similarity index 100% rename from modals/client_software_export_modal.php rename to modals/software_export_modal.php diff --git a/post/user/certificate.php b/post/user/certificate.php index 0a2a5eaa..2fe0a469 100644 --- a/post/user/certificate.php +++ b/post/user/certificate.php @@ -160,25 +160,24 @@ if (isset($_POST['bulk_delete_certificates'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['export_client_certificates_csv'])) { +if (isset($_POST['export_certificates_csv'])) { enforceUserPermission('module_support'); - $client_id = intval($_POST['client_id']); + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND certificate_client_id = $client_id"; + } else { + $client_query = ''; + } - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; - - $sql = mysqli_query($mysqli,"SELECT * FROM certificates WHERE certificate_client_id = $client_id ORDER BY certificate_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM certificates WHERE certificate_archived_at IS NULL $client_query ORDER BY certificate_name ASC"); $num_rows = mysqli_num_rows($sql); if ($num_rows > 0) { $delimiter = ","; - $filename = $client_name . "-Certificates-" . date('Y-m-d') . ".csv"; + $filename = "Certificates-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -205,7 +204,7 @@ if (isset($_POST['export_client_certificates_csv'])) { } // Logging - logAction("Certificate", "Export", "$session_name exported $num_rows certificate(s) to a CSV file", $client_id); + logAction("Certificate", "Export", "$session_name exported $num_rows certificate(s) to a CSV file"); exit; diff --git a/post/user/credential.php b/post/user/credential.php index 20eec768..18d6c6ea 100644 --- a/post/user/credential.php +++ b/post/user/credential.php @@ -325,23 +325,26 @@ if (isset($_POST['bulk_delete_logins'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['export_client_logins_csv'])) { +if (isset($_POST['export_credentials_csv'])) { enforceUserPermission('module_credential'); - $client_id = intval($_POST['client_id']); + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND login_client_id = $client_id"; + } else { + $client_query = ''; + } //get records from database - $sql = mysqli_query($mysqli,"SELECT * FROM logins LEFT JOIN clients ON client_id = login_client_id WHERE login_client_id = $client_id ORDER BY login_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM logins LEFT JOIN clients ON client_id = login_client_id WHERE login_archived_at IS NULL $client_query ORDER BY login_name ASC"); $row = mysqli_fetch_array($sql); - $client_name = $row['client_name']; - $num_rows = mysqli_num_rows($sql); if ($num_rows > 0) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Credentials-" . date('Y-m-d') . ".csv"; + $filename = "Credentials-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -351,7 +354,7 @@ if (isset($_POST['export_client_logins_csv'])) { fputcsv($f, $fields, $delimiter); //output each row of the data, format line as csv and write to file pointer - while($row = $sql->fetch_assoc()) { + while($row = mysqli_fetch_assoc($sql)){ $login_username = decryptLoginEntry($row['login_username']); $login_password = decryptLoginEntry($row['login_password']); $lineData = array($row['login_name'], $row['login_description'], $login_username, $login_password, $row['login_uri']); @@ -370,13 +373,13 @@ if (isset($_POST['export_client_logins_csv'])) { } // Logging - logAction("Credential", "Export", "$session_name exported $num_rows credential(s) to a CSV file", $client_id); + logAction("Credential", "Export", "$session_name exported $num_rows credential(s) to a CSV file"); exit; } -if (isset($_POST["import_client_logins_csv"])) { +if (isset($_POST["import_credentials_csv"])) { enforceUserPermission('module_credential', 2); @@ -465,17 +468,10 @@ if (isset($_POST["import_client_logins_csv"])) { } } -if (isset($_GET['download_client_logins_csv_template'])) { - $client_id = intval($_GET['download_client_logins_csv_template']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; +if (isset($_GET['download_credentials_csv_template'])) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Logins-Template.csv"; + $filename = "Credentials-Template.csv"; //create a file pointer $f = fopen('php://memory', 'w'); diff --git a/post/user/trip.php b/post/user/trip.php index f10c8224..12da2f0a 100644 --- a/post/user/trip.php +++ b/post/user/trip.php @@ -94,7 +94,7 @@ if (isset($_POST['export_trips_csv'])) { if ($count > 0) { $delimiter = ","; - $filename = "$session_company_name-Trips-$file_name_date.csv"; + $filename = "Trips-$file_name_date.csv"; //create a file pointer $f = fopen('php://memory', 'w'); diff --git a/client_software.php b/software.php similarity index 88% rename from client_software.php rename to software.php index a7c23ec7..ae97ba71 100644 --- a/client_software.php +++ b/software.php @@ -4,21 +4,28 @@ $sort = "software_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND software_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM software - WHERE software_client_id = $client_id - AND software_template = 0 + LEFT JOIN clients ON client_id = software_client_id + WHERE software_template = 0 AND software_$archive_query - AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') + AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%' OR client_name LIKE '%$q%') + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -50,7 +57,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      + +
      @@ -65,7 +74,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
      - "> Archived @@ -104,6 +113,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Expire + +
    + @@ -111,6 +127,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    + + Client + + Action