diff --git a/admin/modals/software_template/software_template_add.php b/admin/modals/software_template/software_template_add.php index 9b9492713..485a3f7eb 100644 --- a/admin/modals/software_template/software_template_add.php +++ b/admin/modals/software_template/software_template_add.php @@ -2,15 +2,8 @@ require_once '../../includes/modal_header.php'; -$license_types_array = array ( - 'Device', - 'User', - 'Site', - 'Concurrent', - 'Trial', - 'Perpetual', - 'Usage-based' -); +// The license types the license form offers (functions/software.php) +$license_types_array = array_keys(SOFTWARE_LICENSE_TYPES); ob_start(); @@ -78,7 +71,7 @@ ob_start(); diff --git a/admin/modals/software_template/software_template_edit.php b/admin/modals/software_template/software_template_edit.php index 78cf09e95..030687f76 100644 --- a/admin/modals/software_template/software_template_edit.php +++ b/admin/modals/software_template/software_template_edit.php @@ -14,15 +14,11 @@ $software_type = escapeHtml($row['software_template_type']); $software_license_type = escapeHtml($row['software_template_license_type']); $software_notes = escapeHtml($row['software_template_notes']); -$license_types_array = array ( - 'Device', - 'User', - 'Site', - 'Concurrent', - 'Trial', - 'Perpetual', - 'Usage-based' -); +// The license types the license form offers (functions/software.php), keeping one this template already has +$license_types_array = array_keys(SOFTWARE_LICENSE_TYPES); +if ($row['software_template_license_type'] && !in_array($row['software_template_license_type'], $license_types_array, true)) { + $license_types_array[] = $row['software_template_license_type']; +} ob_start(); @@ -93,7 +89,7 @@ ob_start(); diff --git a/admin/software_templates.php b/admin/software_templates.php index e7adf51a0..ffcc0a52f 100644 --- a/admin/software_templates.php +++ b/admin/software_templates.php @@ -44,7 +44,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
"> - +
@@ -80,18 +80,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?>
- -
- -
-
$software_template_version" ?>
+ +
+ +
+
-
- + License @@ -969,62 +961,20 @@ if (mysqli_num_rows($sql) == 0) {
- Software licensed to this asset. + Licenses this asset holds a seat on, and the key to install. - +
+ + +
-
- - - - - - - - - - - - - - - - - - - - - - - -
SoftwareTypeLicenseSeatsExpires
- -
- 		/ - - - - - - - - - - -
-
+
No licenses linked.
diff --git a/agent/client_overview.php b/agent/client_overview.php index 3032b5163..7fd986ba3 100644 --- a/agent/client_overview.php +++ b/agent/client_overview.php @@ -205,7 +205,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
- +
@@ -226,6 +226,19 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
+ +
+ + + + + + + + +
+ @@ -297,6 +288,9 @@ if (!$can_support) { Upload File(s) + + License + Note @@ -314,9 +308,11 @@ if (!$can_support) { Credential - - License - + + + License + + Service @@ -710,52 +706,29 @@ if (!$can_support) {
+
- Software licensed to them. Seats count every asset and contact on the license. - - + Licenses they hold a seat on, and the key they were given. + +
+ + +
-
- - - - - - - - - - - - - - - -
LicenseTypeSeatsExpires
- - - - -' ?> -
- 		-' ?> - - - -
-
+
No licenses.
+
diff --git a/agent/license.php b/agent/license.php new file mode 100644 index 000000000..f54d07956 --- /dev/null +++ b/agent/license.php @@ -0,0 +1,692 @@ +

Nothing to see here

Go Back"; + +} else { + + $client_id = intval($license['software_client_id']); + enforceClientAccess(); + $client_url = "client_id=$client_id&"; + + $client_name = escapeHtml($license['client_name']); + $software_name = escapeHtml($license['software_name']); + $software_version = escapeHtml($license['software_version']); + $software_type = escapeHtml($license['software_type']); + $software_description = escapeHtml($license['software_description']); + $software_license_type = escapeHtml($license['software_license_type']); + $software_key = $license['software_key']; + $software_purchase_reference = escapeHtml($license['software_purchase_reference']); + $software_purchase = escapeHtml($license['software_purchase']); + $software_purchase_age = assetAge($license['software_purchase']); + $software_notes = escapeHtml($license['software_notes']); + $software_favorite = intval($license['software_favorite']); + $software_created_at = escapeHtml($license['software_created_at']); + $software_archived_at = escapeHtml($license['software_archived_at']); + $vendor_id = intval($license['vendor_id']); + $vendor_name = escapeHtml($license['vendor_name']); + + $seats = softwareSeats($license['seats_used'], $license['software_seats']); + $renewal = softwareRenewal($license['software_expire']); + + $can_edit = lookupUserPermission('module_support') >= 2 && !$software_archived_at; + $can_restore = lookupUserPermission('module_support') >= 2; + $can_delete = lookupUserPermission('module_support') >= 3 && !empty($config_destructive_deletes_enable); + $can_credentials = lookupUserPermission('module_credential') >= 1; + $can_link_credentials = $can_edit && lookupUserPermission('module_credential') >= 2; + + // Override Tab Title // No Sanitizing needed as this var will only be used in the tab title + $page_title = $license['software_name']; + + $holders = softwareSeatHolders($software_id); + $keys = softwareKeys($software_id); + $keys_free = count(array_filter($keys, function ($key) { + return !$key['assets'] && !$key['contacts']; + })); + $credentials = $can_credentials ? linkedRecords('software', $software_id, 'credential') : []; + $documents = linkedRecords('software', $software_id, 'document'); + $files = linkedRecords('software', $software_id, 'file'); + $history = softwareHistory($software_id, 100); + + $license_tabs = [ + 'seats' => ['label' => 'Seats', 'icon' => 'fa-users', 'count' => $seats['used']], + 'keys' => ['label' => 'Keys', 'icon' => 'fa-key', 'count' => count($keys) + ($software_key ? 1 : 0)], + 'credentials' => ['label' => 'Credentials', 'icon' => 'fa-lock', 'count' => count($credentials)], + 'documents' => ['label' => 'Documents', 'icon' => 'fa-file-alt', 'count' => count($documents)], + 'files' => ['label' => 'Files', 'icon' => 'fa-paperclip', 'count' => count($files)], + 'history' => ['label' => 'History', 'icon' => 'fa-history', 'count' => count($history)], + ]; + if (!$can_credentials) { + unset($license_tabs['credentials']); + } + + // A renewal ticket, filled in with what the person doing it needs + $renewal_subject = 'Renew ' . $license['software_name'] . ($renewal ? ' - ' . strtolower($renewal['text']) : ''); + // Plain text, one fact a line - the ticket form escapes it + $renewal_details = implode("\n", array_filter([ + 'Renew ' . trim($license['software_name'] . ' ' . $license['software_version']) . ' for ' . $license['client_name'] . '.', + $renewal ? 'Renewal date: ' . $renewal['date'] : '', + $seats['state'] !== 'unlimited' ? 'Seats: ' . $seats['used'] . ' in use of ' . $seats['total'] : 'Seats in use: ' . $seats['used'], + $license['vendor_name'] ? 'Vendor: ' . $license['vendor_name'] . ($license['vendor_account_number'] ? ' (account ' . $license['vendor_account_number'] . ')' : '') : '', + $license['software_purchase_reference'] ? 'Last order: ' . $license['software_purchase_reference'] : '', + ])); + $renewal_ticket_url = 'modals/ticket/ticket_add.php?' . http_build_query(['client_id' => $client_id, 'subject' => $renewal_subject, 'details' => $renewal_details]); + + $link_url = "modals/link/link.php?from=software&id=$software_id&to="; + $unlink_url = function ($to, $other_id) use ($software_id) { + return "post.php?unlink_item&from=software&id=$software_id&to=$to&other=" . intval($other_id) . "&csrf_token=" . $_SESSION['csrf_token']; + }; + + ?> + +
    +
  1. + +
    2. +
  2. + Licenses +
    3. +
    4. +
+ + +
+
+ + +
+

+ + + + Archived + + + over seats + +

+
+ + + + +
+
+ +
+ + +
+ +
+ + Renewal Ticket + + + Keys + + + Document + + + Upload File(s) + +
+
+
+ +
+ Device + User + + Credential + + Document + File +
+
+ + + +
+ +
+ + + Restore + + + + Delete + + + + + Seats + +
+ + Archive + + +
+
+ +
+
+
+ +
+ + +
+ +
+
+

License

+
+
+
+
Seats
+
+ +
Type
+
+ +
Key
+
+ + + + individual key + + None recorded + +
+
Renews
+
+ + +
+ + No date + +
+ +
Purchased
+
ago
+ + +
Order ref
+
+ +
Added
+
+
+
+ + +
+
+

Vendor

+ +
+
+
+ +
Account
+
+ + +
Phone
+ + +
Email
+
+ + +
Website
+ + +
Hours
+ + +
SLA
+ + +
Contact
Nothing recorded on the vendor yet
+ +
+
+
+ + +
+
+

Notes

+
+ +
+ +
+ + +
+
+
+
    + $tab) { ?> + + +
+
+
+ + +
+
+ + + in use - no seat limit. + + of seats in use' . $seats['over'] . ' over' : ($seats['free'] ? ', ' . $seats['free'] . ' free' : '') ?>. + + + + + +
+ +
Devices
+
+ + + + + + + + + + + +
+
+ +
+ +
+
+
+ 		+ + + + Nobody assigned + + + +
+ + + License key + + 		+ + + +
+
+ + +
Users
+
+ + + + + + + + + + +
+ 'sm', 'class' => 'fw-semibold']) ?> + +
+ +
+ + 		+ +
+ + 		+ + + +
+
+ + +
+
Nothing and nobody on this license yet.
+ + + +
+ +
+ + +
+
+ + + individual key. A key shows on the page of whoever has it. + + A key per device or user, for licenses sold that way. Each shows on the page of whoever has it. + + + + + +
+ +
+ License key + + Covers every seat - change it with Edit +
+ + +
+ + + + + + + + + + + + + +
KeyHanded to
+
+ + + + + + + !empty($key_contact['contact_archived_at'])]) ?> + + + Free + +
+ 		+ + + + +
+
+ +
No keys recorded.
+ +
+ + + +
+
+ Logins that go with it - the vendor portal, the admin console. Passwords are fetched only when you ask. + + + +
+ +
+ + + + + + + + + + + + + + + +
NameUsernamePasswordOTP
+ + +
+ 		+ + + + - + + + + + + + Hover... + + - + + + + + +
+
+ +
No credentials linked.
+ +
+ + + + ['document', $documents, 'Setup guides, the renewal process, what is included.', 'No documents linked.'], + 'files' => ['file', $files, 'Invoices, license certificates, installers, exports.', 'No files linked.']] as $pane => [$to, $linked, $hint, $empty]) { ?> +
+
+ + +
+ + + + + + +
+ +
+ +
    + +
  • + + + + +
    • + +
+ +
+ +
+ + + +
+
+ Renewals, seat and key changes, edits - newest first. +
+ 'fa-plus', 'Edit' => 'fa-edit', 'Renew' => 'fa-redo-alt', 'Seats' => 'fa-users', 'Keys' => 'fa-key', + 'Link' => 'fa-link', 'Unlink' => 'fa-unlink', 'Archive' => 'fa-archive', 'Restore' => 'fa-redo', 'Export' => 'fa-download']; ?> +
    + +
  • + +
    +
    +
    ·
    +
    +
    • + +
+ +
Nothing logged yet.
+ +
+ +
+
+
+ +
+ + + + + + + + + +
-
    - -
  • - - seats -
    • - -
+ +
diff --git a/agent/modals/asset/asset_link_software.php b/agent/modals/asset/asset_link_software.php index 06aa36f7e..a0171c2ed 100644 --- a/agent/modals/asset/asset_link_software.php +++ b/agent/modals/asset/asset_link_software.php @@ -1,72 +1,13 @@ - - -
-
License Software to
- -
-
- - -
- -
-
- - -
-
-
-
- - -
-
- -
-
    - -
  • - - seats -
    • - -
+ +
diff --git a/agent/modals/contact/contact_link_software.php b/agent/modals/contact/contact_link_software.php index 7420d2105..2aac3ca0d 100644 --- a/agent/modals/contact/contact_link_software.php +++ b/agent/modals/contact/contact_link_software.php @@ -1,69 +1,13 @@ - -
-
License Software to
- -
-
- - -
- -
-
- - -
-
-
-
- - -
-
- - +require __DIR__ . '/../link/link.php'; diff --git a/agent/modals/document/document_add.php b/agent/modals/document/document_add.php index 912a22a6e..5977f8356 100644 --- a/agent/modals/document/document_add.php +++ b/agent/modals/document/document_add.php @@ -1,8 +1,8 @@ "> +
diff --git a/agent/modals/file/file_upload.php b/agent/modals/file/file_upload.php index 0b298641c..54a49d109 100644 --- a/agent/modals/file/file_upload.php +++ b/agent/modals/file/file_upload.php @@ -3,8 +3,8 @@ /* * Upload files into a folder - dropped onto the box, picked with the button, * or dropped straight onto the files list (agent/js/files.js opens this and - * hands them over). Opened from an asset or a contact, the uploads are also - * linked to it. + * hands them over). Opened from an asset, a contact or a license, the uploads + * are also linked to it. */ require_once '../../../includes/modal_header.php'; @@ -18,7 +18,9 @@ $folder_id = folderOwnedId($_GET['folder_id'] ?? 0, $client_id); $contact_id = assetClientOwnedId('contact', $_GET['contact_id'] ?? 0, $client_id); $asset = linkRecord('asset', $_GET['asset_id'] ?? 0); $asset_id = $asset && intval($asset['client_id']) === $client_id ? intval($asset['id']) : 0; -$link_name = $asset_id ? $asset['name'] : ($contact_id ? getFieldById('contacts', $contact_id, 'contact_name') : ''); +$software = linkRecord('software', $_GET['software_id'] ?? 0); +$software_id = $software && intval($software['client_id']) === $client_id ? intval($software['id']) : 0; +$link_name = $asset_id ? $asset['name'] : ($contact_id ? getFieldById('contacts', $contact_id, 'contact_name') : ($software_id ? $software['name'] : '')); // The extensions agent/post/file.php accepts - offered to the picker so the wrong kind is never chosen $upload_extensions = ['jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'odt', 'csv', 'xls', 'xlsx', 'ods', @@ -38,6 +40,7 @@ ob_start(); +
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+
diff --git a/agent/modals/software/software_form.php b/agent/modals/software/software_form.php new file mode 100644 index 000000000..0f9e2e0f8 --- /dev/null +++ b/agent/modals/software/software_form.php @@ -0,0 +1,417 @@ + Categories, keeping a retired value that is still set +$type_options = []; +$sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'software_type' AND category_archived_at IS NULL ORDER BY category_order ASC, category_name ASC"); +while ($row = mysqli_fetch_assoc($sql)) { + $type_options[] = $row['category_name']; +} +$software_type_raw = html_entity_decode($software_type, ENT_QUOTES, 'UTF-8'); +if ($software_type_raw !== '' && !in_array($software_type_raw, $type_options, true)) { + $type_options[] = $software_type_raw; +} + +// License types - the usual ones, keeping whatever this one already has +$license_type_options = array_keys(SOFTWARE_LICENSE_TYPES); +$software_license_type_raw = html_entity_decode($software_license_type, ENT_QUOTES, 'UTF-8'); +if ($software_license_type_raw !== '' && !in_array($software_license_type_raw, $license_type_options, true)) { + $license_type_options[] = $software_license_type_raw; +} + +// The client's own lists - only once the client is known +$vendor_options = $asset_options = $contact_options = []; +if ($client_id) { + $sql = mysqli_query($mysqli, "SELECT vendor_archived_at, vendor_id, vendor_name, vendor_description FROM vendors + WHERE vendor_client_id = $client_id AND (vendor_archived_at IS NULL OR vendor_id = $software_vendor_id) + ORDER BY vendor_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $vendor_options[] = $row; + } + $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type, asset_make, asset_model, contact_name FROM assets + LEFT JOIN contacts ON contact_id = asset_contact_id + WHERE asset_client_id = $client_id AND asset_archived_at IS NULL + ORDER BY asset_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $asset_options[] = $row; + } + $sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_photo, contact_client_id FROM contacts + WHERE contact_client_id = $client_id AND contact_archived_at IS NULL + ORDER BY contact_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $contact_options[] = $row; + } +} else { + $client_options = []; + $sql = mysqli_query($mysqli, "SELECT client_id, client_name, client_abbreviation FROM clients WHERE client_archived_at IS NULL " . clientScopeSql('clients.client_id') . " ORDER BY client_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $client_options[] = $row; + } +} + +// Templates (Admin > License Templates) to start a new license from +$template_options = []; +if ($software_form_mode === 'add') { + $sql = mysqli_query($mysqli, "SELECT software_template_id, software_template_name, software_template_version, software_template_description, + software_template_type, software_template_license_type, software_template_notes + FROM software_templates WHERE software_template_archived_at IS NULL ORDER BY software_template_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $template_options[intval($row['software_template_id'])] = [ + 'name' => $row['software_template_name'], + 'version' => (string) $row['software_template_version'], + 'description' => (string) $row['software_template_description'], + 'type' => $row['software_template_type'], + 'license_type' => (string) $row['software_template_license_type'], + 'notes' => (string) $row['software_template_notes'], + ]; + } +} + +$software_type_style = softwareTypeStyle($software_type); +$form_id = 'softwareForm' . ($software_form_mode === 'edit' ? $software_id : 'New'); + +?> + + + +
+ + +
+
+ +
+ +
+ + +
+
Pick the vendor and who is on it once it's saved.
+
+ + + +
+ +
+ + +
+
Fills in the name, type, license type, description and notes - change anything after.
+
+ + +
+ +
+ + > +
+ +
+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+
+ + +

License ID

+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
Leave blank for a site or unlimited license.
+
+
+ +
+ + +
+
The one key for the whole license, if it has one.
+
+ +
+ + +
Hand each one to a device or user from the license's Keys tab.
+
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + + + + +
+
Shows on the client overview's renewals and the dashboard as it gets close.
+
+
+
+ + +
+ + +
+ Each device and user here takes a seat. + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +

Pick the devices and users once it's saved - they come from the client.

+ +
+ +
+ +
+ +
+ + diff --git a/agent/modals/software/software_key_add.php b/agent/modals/software/software_key_add.php new file mode 100644 index 000000000..5342eeb1b --- /dev/null +++ b/agent/modals/software/software_key_add.php @@ -0,0 +1,44 @@ + 'That license no longer exists.']); + exit; +} +$client_id = intval($row['software_client_id']); +enforceClientAccess(); + +ob_start(); + +?> +
+
Add keys to
+ +
+ + + +
+ + +
Paste straight from the vendor's portal or the order email - one per line. Keys it already has are skipped.
+
+
+ + +
+ + + 'That key no longer exists.']); + exit; +} +$client_id = intval($row['software_client_id']); +enforceClientAccess(); + +$software_id = intval($row['software_id']); +$assigned_assets = $assigned_contacts = []; +$sql = mysqli_query($mysqli, "SELECT asset_id FROM software_key_asset_assignments WHERE software_key_id = $software_key_id"); +while ($assigned = mysqli_fetch_row($sql)) { + $assigned_assets[] = intval($assigned[0]); +} +$sql = mysqli_query($mysqli, "SELECT contact_id FROM software_key_contact_assignments WHERE software_key_id = $software_key_id"); +while ($assigned = mysqli_fetch_row($sql)) { + $assigned_contacts[] = intval($assigned[0]); +} + +// Who is on the license already - listed first, so the usual pick is at the top +$holders = softwareSeatHolders($software_id); +$seat_assets = array_map('intval', array_column($holders['assets'], 'asset_id')); +$seat_contacts = array_map('intval', array_column($holders['contacts'], 'contact_id')); + +$asset_options = []; +$sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type, asset_make, asset_model FROM assets + WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC"); +while ($option = mysqli_fetch_assoc($sql)) { + $option['on_license'] = in_array(intval($option['asset_id']), $seat_assets, true); + $asset_options[] = $option; +} +$contact_options = []; +$sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_photo, contact_client_id FROM contacts + WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC"); +while ($option = mysqli_fetch_assoc($sql)) { + $option['on_license'] = in_array(intval($option['contact_id']), $seat_contacts, true); + $contact_options[] = $option; +} +$on_license_first = function ($a, $b) { + return intval($b['on_license']) - intval($a['on_license']); +}; +usort($asset_options, $on_license_first); +usort($contact_options, $on_license_first); + +ob_start(); + +?> +
+
Key on
+ +
+
+ + +
+
+ +
+ + + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
Leave both empty to put the key back in the pool.
+
+
+ + +
+
+ + 'Tick the licenses to renew first.']); + exit; +} + +$single = count($licenses) === 1; +$default_term = '1y'; + +ob_start(); + +?> +
+
Renew ' . escapeHtml($licenses[0]['software_name']) . '' : '' . count($licenses) . ' licenses' ?>
+ +
+
+ + + + +
+ + +
+ $term_label) { ?> + > + + + + +
+ +
Each date moves on from its current renewal date, or from today if it has already passed.
+ +
+ + + + + + + + + + + +
LicenseRenews nowNew date
+
+ +
+
+
+
+
+ 		+ + +
+ + No date + +
+
+ + +
+ + +
+ +
+
+ + +
+
+ + + + 'That license no longer exists.']); + exit; +} +$client_id = intval($row['software_client_id']); +enforceClientAccess(); + +$seats_total = intval($row['software_seats']); +$holders = softwareSeatHolders($software_id); +$asset_ids = array_map('intval', array_column($holders['assets'], 'asset_id')); +$contact_ids = array_map('intval', array_column($holders['contacts'], 'contact_id')); + +$asset_options = []; +$sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type, asset_make, asset_model, contact_name FROM assets + LEFT JOIN contacts ON contact_id = asset_contact_id + WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC"); +while ($option = mysqli_fetch_assoc($sql)) { + $asset_options[] = $option; +} +$contact_options = []; +$sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_photo, contact_client_id FROM contacts + WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC"); +while ($option = mysqli_fetch_assoc($sql)) { + $contact_options[] = $option; +} + +// Start on users for a per-user license, devices otherwise +$users_first = in_array($row['software_license_type'], ['User', 'Subscription', 'Concurrent'], true); + +ob_start(); + +?> +
+
Seats on
+ +
+
+ + + +
+
+ Each device and user here takes a seat. + +
+ ['label' => 'Users', 'icon' => 'fa-user', 'placeholder' => $contact_options ? 'Pick the people licensed to use it' : 'This client has no contacts yet'], + 'assets' => ['label' => 'Devices', 'icon' => 'fa-desktop', 'placeholder' => $asset_options ? 'Pick the devices it is installed on' : 'This client has no assets yet'], + ]; + if (!$users_first) { + $pickers = array_reverse($pickers, true); + } + foreach ($pickers as $field => $picker) { ?> +
+ +
+ + +
+
+ +
+
+ + +
+
+ + + +' . nl2br(escapeHtml($prefill_details)) . '

' : ''; + if ($client_id) { enforceClientAccess(); } @@ -91,12 +97,12 @@ ob_start();
- +
- +
diff --git a/agent/modals/vendor/vendor.php b/agent/modals/vendor/vendor.php index 892e12ea9..88b72cbc2 100644 --- a/agent/modals/vendor/vendor.php +++ b/agent/modals/vendor/vendor.php @@ -15,8 +15,8 @@ $name = escapeHtml($row['vendor_name']); $description = escapeHtml($row['vendor_description']); $account_number = escapeHtml($row['vendor_account_number']); $contact_name = escapeHtml($row['vendor_contact_name']); -$phone = preg_replace("/[^0-9]/", '',$row['vendor_phone']); -$extension = preg_replace("/[^0-9]/", '',$row['vendor_extension']); +$phone = preg_replace("/[^0-9]/", '', (string) $row['vendor_phone']); +$extension = preg_replace("/[^0-9]/", '', (string) $row['vendor_extension']); $email = escapeHtml($row['vendor_email']); $website = escapeHtml($row['vendor_website']); $hours = escapeHtml($row['vendor_hours']); @@ -29,6 +29,19 @@ if ($client_id) { enforceClientAccess(); } +// Licenses bought through this vendor - soonest renewal first +$vendor_licenses = []; +if (lookupUserPermission('module_support') >= 1) { + $sql_vendor_licenses = mysqli_query($mysqli, "SELECT software_id AS id, software_name AS name, software_type, software_version, software_license_type, + software_seats, software_expire, " . softwareSeatsUsedSql('software.software_id') . " AS seats_used + FROM software + WHERE software_vendor_id = $vendor_id AND software_archived_at IS NULL " . clientScopeSql('software_client_id') . " + ORDER BY software_expire IS NULL, software_expire ASC, software_name ASC"); + while ($vendor_license = mysqli_fetch_assoc($sql_vendor_licenses)) { + $vendor_licenses[] = $vendor_license; + } +} + ob_start(); ?> @@ -80,6 +93,20 @@ ob_start();
+ + +
+
+
Licenses
+
    + +
    • + +
+
+
+ +
diff --git a/agent/post/asset.php b/agent/post/asset.php index 780141fe1..f7c3480d5 100644 --- a/agent/post/asset.php +++ b/agent/post/asset.php @@ -856,65 +856,7 @@ if (isset($_POST['bulk_delete_assets'])) { // BEGIN LINKING -if (isset($_POST['link_software_to_asset'])) { - - validateCSRFToken(); - - enforceUserPermission('module_support', 2); - - $software_id = intval($_POST['software_id']); - $asset_id = intval($_POST['asset_id']); - - // Get software Name and Client ID for logging - $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql_software); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); - - enforceClientAccess(); - - // Get Asset Name for logging - $asset_name = escapeSql(getFieldById('assets', $asset_id, 'asset_name')); - - mysqli_query($mysqli,"INSERT INTO software_assets SET asset_id = $asset_id, software_id = $software_id"); - - logAudit("Software", "Link", "$session_name added software license $software_name to asset $asset_name", $client_id, $software_id); - - flashAlert("Software $software_name licensed for asset $asset_name"); - - redirect(); - -} - -if (isset($_GET['unlink_software_from_asset'])) { - - validateCSRFToken(); - - enforceUserPermission('module_support', 2); - - $asset_id = intval($_GET['asset_id']); - $software_id = intval($_GET['software_id']); - - // Get software Name and Client ID for logging - $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql_software); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); - - enforceClientAccess(); - - // Get Asset Name for logging - $asset_name = escapeSql(getFieldById('assets', $asset_id, 'asset_name')); - - mysqli_query($mysqli,"DELETE FROM software_assets WHERE asset_id = $asset_id AND software_id = $software_id"); - - logAudit("software", "Unlink", "$session_name removed software license $software_name from asset $asset_name", $client_id, $software_id); - - flashAlert("Removed Software License $software_name for Asset $asset_name", 'error'); - - redirect(); - -} +// Licenses are linked in post/link.php (link_software_to_asset) // Right now 1 login and have many assets but not many to many if (isset($_POST['link_asset_to_credential'])) { diff --git a/agent/post/contact.php b/agent/post/contact.php index b4f5b6d0e..96db39d70 100644 --- a/agent/post/contact.php +++ b/agent/post/contact.php @@ -990,65 +990,7 @@ if (isset($_GET['unlink_asset_from_contact'])) { } -if (isset($_POST['link_software_to_contact'])) { - - validateCSRFToken(); - - enforceUserPermission('module_client', 2); - - $software_id = intval($_POST['software_id']); - $contact_id = intval($_POST['contact_id']); - - // Get software Name and Client ID for logging - $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql_software); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); - - enforceClientAccess(); - - // Get Contact Name for logging - $contact_name = escapeSql(getFieldById('contacts', $contact_id, 'contact_name')); - - mysqli_query($mysqli,"INSERT INTO software_contacts SET contact_id = $contact_id, software_id = $software_id"); - - logAudit("Software", "Link", "$session_name added software license $software_name to contact $contact_name", $client_id, $software_id); - - flashAlert("Software $software_name licensed for contact $contact_name"); - - redirect(); - -} - -if (isset($_GET['unlink_software_from_contact'])) { - - validateCSRFToken(); - - enforceUserPermission('module_client', 2); - - $contact_id = intval($_GET['contact_id']); - $software_id = intval($_GET['software_id']); - - // Get software Name and Client ID for logging - $sql_software = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql_software); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); - - enforceClientAccess(); - - // Get Contact Name for logging - $contact_name = escapeSql(getFieldById('contacts', $contact_id, 'contact_name')); - - mysqli_query($mysqli,"DELETE FROM software_contacts WHERE contact_id = $contact_id AND software_id = $software_id"); - - logAudit("software", "Unlink", "$session_name removed software license $software_name from contact $contact_name", $client_id, $software_id); - - flashAlert("Removed Software License $software_name for Contact $contact_name", 'error'); - - redirect(); - -} +// Licenses are linked in post/link.php (link_software_to_contact) if (isset($_POST['link_contact_to_credential'])) { diff --git a/agent/post/document.php b/agent/post/document.php index 078c73a3d..e2a63e7e2 100644 --- a/agent/post/document.php +++ b/agent/post/document.php @@ -52,11 +52,13 @@ if (isset($_POST['add_document'])) { enforceClientAccess(); - // Only the client's own folder, contact and asset + // Only the client's own folder, contact, asset and license $folder = folderOwnedId($folder, $client_id); $contact_id = assetClientOwnedId('contact', $_POST['contact'] ?? 0, $client_id); $asset = linkRecord('asset', $_POST['asset'] ?? 0); $asset_id = $asset && intval($asset['client_id']) === $client_id ? intval($asset['id']) : 0; + $software = linkRecord('software', $_POST['software'] ?? 0); + $software_id = $software && intval($software['client_id']) === $client_id ? intval($software['id']) : 0; $client_visible = intval($_POST['client_visible'] ?? 0) ? 1 : 0; if ($name === '') { @@ -84,13 +86,16 @@ if (isset($_POST['add_document'])) { if ($asset_id) { mysqli_query($mysqli, "INSERT IGNORE INTO asset_documents SET asset_id = $asset_id, document_id = $document_id"); } + if ($software_id) { + mysqli_query($mysqli, "INSERT IGNORE INTO software_documents SET software_id = $software_id, document_id = $document_id"); + } logAudit("Document", "Create", "$session_name created document $name", $client_id, $document_id); flashAlert("Document " . trim($_POST['name']) . " created"); - // From an asset or a contact, back to it; otherwise to the new document - redirect(($contact_id || $asset_id) ? null : "document.php?client_id=$client_id&document_id=$document_id"); + // From an asset, a contact or a license, back to it; otherwise to the new document + redirect(($contact_id || $asset_id || $software_id) ? null : "document.php?client_id=$client_id&document_id=$document_id"); } diff --git a/agent/post/file.php b/agent/post/file.php index 6a7f4365e..f16cb129b 100644 --- a/agent/post/file.php +++ b/agent/post/file.php @@ -28,11 +28,13 @@ if (isset($_POST['upload_files'])) { enforceClientAccess(); - // Only the client's own folder, contact and asset + // Only the client's own folder, contact, asset and license $folder_id = folderOwnedId($_POST['folder_id'] ?? 0, $client_id); $contact_id = assetClientOwnedId('contact', $_POST['contact_id'] ?? 0, $client_id); $asset = linkRecord('asset', $_POST['asset_id'] ?? 0); $asset_id = $asset && intval($asset['client_id']) === $client_id ? intval($asset['id']) : 0; + $software = linkRecord('software', $_POST['software_id'] ?? 0); + $software_id = $software && intval($software['client_id']) === $client_id ? intval($software['id']) : 0; if (!is_dir($client_dir)) { mkdir($client_dir, 0755, true); @@ -97,6 +99,9 @@ if (isset($_POST['upload_files'])) { if ($asset_id) { mysqli_query($mysqli, "INSERT IGNORE INTO asset_files SET asset_id = $asset_id, file_id = $file_id"); } + if ($software_id) { + mysqli_query($mysqli, "INSERT IGNORE INTO software_files SET software_id = $software_id, file_id = $file_id"); + } logAudit("File", "Upload", "$session_name uploaded file $file_name", $client_id, $file_id); diff --git a/agent/post/link.php b/agent/post/link.php index e9ce95bd4..e1e88f2da 100644 --- a/agent/post/link.php +++ b/agent/post/link.php @@ -1,7 +1,8 @@ {$source['name']}.", 'warning'); } elseif (count($added) === 1) { - flashAlert(ucfirst($to_entity['label']) . " {$added[0]} linked to {$source['name']}"); + flashAlert(ucfirst($to_entity['label']) . " {$added[0]} linked to {$source['name']}$seat_warning", $seat_warning ? 'warning' : 'success'); } else { - flashAlert("Linked " . count($added) . " " . strtolower($to_entity['plural']) . " to {$source['name']}"); + flashAlert("Linked " . count($added) . " " . strtolower($to_entity['plural']) . " to {$source['name']}$seat_warning", $seat_warning ? 'warning' : 'success'); } } else { $removed = linkRemove($from, $source['id'], $to, intval($ids[0] ?? 0)); @@ -70,6 +80,8 @@ $legacy_links = [ 'vendor_to_document' => ['document', 'document_id', 'vendor', 'vendor_id'], 'asset_to_file' => ['file', 'file_id', 'asset', 'asset_id'], 'contact_to_file' => ['file', 'file_id', 'contact', 'contact_id'], + 'software_to_asset' => ['asset', 'asset_id', 'software', 'software_id'], + 'software_to_contact' => ['contact', 'contact_id', 'software', 'software_id'], ]; foreach ($legacy_links as $legacy => [$from, $from_field, $to, $to_field]) { if (isset($_POST["link_$legacy"])) { diff --git a/agent/post/software.php b/agent/post/software.php index 3281a3975..07bb064ab 100644 --- a/agent/post/software.php +++ b/agent/post/software.php @@ -1,46 +1,48 @@ $name created from template"); - - redirect(); - +/** The license ids a bulk form posted, each checked for client access. Returns [id => row]. */ +function softwareBulkRows($ids) { + global $client_id; + $rows = []; + foreach (array_unique(array_map('intval', (array) $ids)) as $software_id) { + $row = softwareRow($software_id); + if (!$row) { + continue; + } + $client_id = intval($row['software_client_id']); + enforceClientAccess(); + $rows[$software_id] = $row; + } + return $rows; } if (isset($_POST['add_software'])) { @@ -49,58 +51,66 @@ if (isset($_POST['add_software'])) { enforceUserPermission('module_support', 2); - $client_id = intval($_POST['client_id']); - $name = escapeSql($_POST['name']); - $version = escapeSql($_POST['version']); - $description = escapeSql($_POST['description']); - $type = escapeSql($_POST['type']); - $license_type = escapeSql($_POST['license_type']); - $notes = escapeSql($_POST['notes']); - $key = escapeSql($_POST['key']); - $seats = intval($_POST['seats']); - $purchase_reference = escapeSql($_POST['purchase_reference']); - $purchase = escapeSql($_POST['purchase']); - if (empty($purchase)) { - $purchase = "NULL"; - } else { - $purchase = "'" . $purchase . "'"; - } - $expire = escapeSql($_POST['expire']); - if (empty($expire)) { - $expire = "NULL"; - } else { - $expire = "'" . $expire . "'"; - } - $notes = escapeSql($_POST['notes']); - $vendor = intval($_POST['vendor'] ?? 0); + $client_id = intval($_POST['client_id'] ?? 0); enforceClientAccess(); - mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase_reference = '$purchase_reference', software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_vendor_id = $vendor, software_client_id = $client_id"); + $set = softwareFormSet($_POST, $client_id); + if ($set === null) { + flashAlert('A license needs a name.', 'error'); + redirect(); + } + + mysqli_query($mysqli, "INSERT INTO software SET $set, software_client_id = $client_id"); + $software_id = mysqli_insert_id($mysqli); + + $changes = softwareSyncSeats($software_id, $client_id, $_POST['assets'] ?? [], $_POST['contacts'] ?? []); + $keys_added = softwareAddKeys($software_id, $_POST['keys'] ?? ''); + + $name = trim($_POST['name']); + logAudit("Software", "Create", "$session_name created license " . escapeSql($name . softwareSeatChangeText($changes)), $client_id, $software_id); + + $warning = softwareSeatWarning($software_id); + flashAlert("License $name created" . ($keys_added ? " with $keys_added key" . ($keys_added === 1 ? '' : 's') : '') . $warning, $warning ? 'warning' : 'success'); + + redirect(); + +} + +if (isset($_POST['add_software_from_template'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $client_id = intval($_POST['client_id'] ?? 0); + $software_template_id = intval($_POST['software_template_id'] ?? 0); + + enforceClientAccess(); + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT software_template_description, software_template_license_type, software_template_name, + software_template_notes, software_template_type, software_template_version FROM software_templates + WHERE software_template_id = $software_template_id AND software_template_archived_at IS NULL")); + if (!$row) { + flashAlert('That template no longer exists.', 'error'); + redirect(); + } + + $name = escapeSql($row['software_template_name']); + $version = escapeSql($row['software_template_version']); + $description = escapeSql($row['software_template_description']); + $type = escapeSql($row['software_template_type']); + $license_type = escapeSql($row['software_template_license_type']); + $notes = escapeSql($row['software_template_notes']); + $vendor = assetClientOwnedId('vendor', $_POST['vendor'] ?? 0, $client_id); + + mysqli_query($mysqli, "INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_vendor_id = $vendor, software_client_id = $client_id"); $software_id = mysqli_insert_id($mysqli); - $alert_extended = ""; + logAudit("Software", "Create", "$session_name created license $name from a template", $client_id, $software_id); - // Add Asset Licenses - if (isset($_POST['assets'])) { - foreach($_POST['assets'] as $asset) { - $asset_id = intval($asset); - mysqli_query($mysqli,"INSERT INTO software_assets SET software_id = $software_id, asset_id = $asset_id"); - } - } - - // Add Contact Licenses - if (isset($_POST['contacts'])) { - foreach($_POST['contacts'] as $contact) { - $contact = intval($contact); - mysqli_query($mysqli,"INSERT INTO software_contacts SET software_id = $software_id, contact_id = $contact"); - } - } - - logAudit("Software", "Create", "$session_name created software $name", $client_id, $software_id); - - flashAlert("Software $name created $alert_extended"); + flashAlert("License {$row['software_template_name']} created from template"); redirect(); @@ -112,59 +122,191 @@ if (isset($_POST['edit_software'])) { enforceUserPermission('module_support', 2); - $software_id = intval($_POST['software_id']); - $name = escapeSql($_POST['name']); - $version = escapeSql($_POST['version']); - $description = escapeSql($_POST['description']); - $type = escapeSql($_POST['type']); - $license_type = escapeSql($_POST['license_type']); - $notes = escapeSql($_POST['notes']); - $key = escapeSql($_POST['key']); - $seats = intval($_POST['seats']); - $purchase_reference = escapeSql($_POST['purchase_reference']); - $purchase = escapeSql($_POST['purchase']); - if (empty($purchase)) { - $purchase = "NULL"; + $row = softwareForRequest($_POST['software_id'] ?? 0); + $software_id = intval($row['software_id']); + + $set = softwareFormSet($_POST, $client_id); + if ($set === null) { + flashAlert('A license needs a name.', 'error'); + redirect(); + } + + mysqli_query($mysqli, "UPDATE software SET $set WHERE software_id = $software_id"); + + // Only a form that showed the seats changes them + $changes = ['added' => [], 'removed' => []]; + if (isset($_POST['seats_form'])) { + $changes = softwareSyncSeats($software_id, $client_id, $_POST['assets'] ?? [], $_POST['contacts'] ?? []); + } + + $name = trim($_POST['name']); + logAudit("Software", "Edit", "$session_name edited license " . escapeSql($name . softwareSeatChangeText($changes)), $client_id, $software_id); + + $warning = softwareSeatWarning($software_id); + flashAlert("License $name updated$warning", $warning ? 'warning' : 'success'); + + redirect(); + +} + +if (isset($_POST['set_software_seats'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $row = softwareForRequest($_POST['software_id'] ?? 0); + $software_id = intval($row['software_id']); + + $changes = softwareSyncSeats($software_id, $client_id, $_POST['assets'] ?? [], $_POST['contacts'] ?? []); + + if ($changes['added'] || $changes['removed']) { + logAudit("Software", "Seats", "$session_name changed seats on license " . escapeSql($row['software_name'] . softwareSeatChangeText($changes)), $client_id, $software_id); + } + + $warning = softwareSeatWarning($software_id); + $summary = []; + if ($changes['added']) { + $summary[] = count($changes['added']) . ' added'; + } + if ($changes['removed']) { + $summary[] = count($changes['removed']) . ' removed'; + } + flashAlert("Seats on {$row['software_name']} " . ($summary ? 'updated - ' . implode(', ', $summary) : 'unchanged') . $warning, $warning ? 'warning' : 'success'); + + redirect(); + +} + +if (isset($_POST['renew_software'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $rows = softwareBulkRows($_POST['software_ids'] ?? []); + $mode = ($_POST['renew_mode'] ?? '') === 'date' ? 'date' : 'extend'; + $term = (string) ($_POST['renew_term'] ?? ''); + $new_date = softwareFormDate($_POST['renew_date'] ?? ''); + $reference = trim((string) ($_POST['purchase_reference'] ?? '')); + + if (!$rows || ($mode === 'extend' && !isset(SOFTWARE_RENEWAL_TERMS[$term])) || ($mode === 'date' && !$new_date)) { + flashAlert('Pick a term or a new renewal date.', 'error'); + redirect(); + } + + $renewed = []; + foreach ($rows as $software_id => $row) { + $client_id = intval($row['software_client_id']); + $until = $mode === 'date' ? $new_date : softwareRenewalExtended($row['software_expire'], $term); + $reference_sql = $reference !== '' ? ", software_purchase_reference = '" . escapeSql(mb_substr($reference, 0, 200)) . "'" : ''; + + mysqli_query($mysqli, "UPDATE software SET software_expire = '$until' $reference_sql WHERE software_id = $software_id"); + + $was = $row['software_expire'] ?: 'no date'; + logAudit("Software", "Renew", "$session_name renewed license " . escapeSql($row['software_name']) . " until $until (was $was)" . ($reference !== '' ? ', reference ' . escapeSql($reference) : ''), $client_id, $software_id); + $renewed[] = [$row['software_name'], $until]; + } + + if (count($renewed) === 1) { + flashAlert("License {$renewed[0][0]} renewed until {$renewed[0][1]}"); } else { - $purchase = "'" . $purchase . "'"; + flashAlert("Renewed " . count($renewed) . " licenses"); } - $expire = escapeSql($_POST['expire']); - if (empty($expire)) { - $expire = "NULL"; + + redirect(); + +} + +if (isset($_POST['add_software_keys'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $row = softwareForRequest($_POST['software_id'] ?? 0); + $software_id = intval($row['software_id']); + + $added = softwareAddKeys($software_id, $_POST['keys'] ?? ''); + + if ($added) { + logAudit("Software", "Keys", "$session_name added $added key" . ($added === 1 ? '' : 's') . " to license " . escapeSql($row['software_name']), $client_id, $software_id); + flashAlert("Added $added key" . ($added === 1 ? '' : 's') . " to {$row['software_name']}"); } else { - $expire = "'" . $expire . "'"; - } - $notes = escapeSql($_POST['notes']); - $vendor = intval($_POST['vendor'] ?? 0); - - $client_id = intval(getFieldById('software', $software_id, 'software_client_id')); - - enforceClientAccess(); - - mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase_reference = '$purchase_reference', software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_vendor_id = $vendor WHERE software_id = $software_id"); - - - // Update Asset Licenses - mysqli_query($mysqli,"DELETE FROM software_assets WHERE software_id = $software_id"); - if (isset($_POST['assets'])) { - foreach($_POST['assets'] as $asset) { - $asset = intval($asset); - mysqli_query($mysqli,"INSERT INTO software_assets SET software_id = $software_id, asset_id = $asset"); - } + flashAlert("No new keys to add - blank, or {$row['software_name']} already has them.", 'warning'); } - // Update Contact Licenses - mysqli_query($mysqli,"DELETE FROM software_contacts WHERE software_id = $software_id"); - if (isset($_POST['contacts'])) { - foreach($_POST['contacts'] as $contact) { - $contact = intval($contact); - mysqli_query($mysqli,"INSERT INTO software_contacts SET software_id = $software_id, contact_id = $contact"); - } + redirect(); + +} + +if (isset($_POST['edit_software_key'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $software_key_id = intval($_POST['software_key_id'] ?? 0); + $key_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT software_key, software_key_software_id FROM software_keys WHERE software_key_id = $software_key_id")); + if (!$key_row) { + flashAlert('That key no longer exists.', 'error'); + redirect(); + } + $row = softwareForRequest($key_row['software_key_software_id']); + $software_id = intval($row['software_id']); + + $key = mb_substr(trim((string) ($_POST['key'] ?? '')), 0, 400); + if ($key === '') { + flashAlert('A key cannot be blank - delete it instead.', 'error'); + redirect(); + } + mysqli_query($mysqli, "UPDATE software_keys SET software_key = '" . escapeSql($key) . "' WHERE software_key_id = $software_key_id"); + + // Who it is handed to - only the client's own, and each one gets a seat if they had none + $assets = softwareClientIds('asset', $_POST['assets'] ?? [], $client_id); + $contacts = softwareClientIds('contact', $_POST['contacts'] ?? [], $client_id); + mysqli_query($mysqli, "DELETE FROM software_key_asset_assignments WHERE software_key_id = $software_key_id"); + mysqli_query($mysqli, "DELETE FROM software_key_contact_assignments WHERE software_key_id = $software_key_id"); + $holders = []; + foreach ($assets as $asset_id) { + mysqli_query($mysqli, "INSERT IGNORE INTO software_key_asset_assignments SET software_key_id = $software_key_id, asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT IGNORE INTO software_assets SET software_id = $software_id, asset_id = $asset_id"); + $holders[] = getFieldById('assets', $asset_id, 'asset_name'); + } + foreach ($contacts as $contact_id) { + mysqli_query($mysqli, "INSERT IGNORE INTO software_key_contact_assignments SET software_key_id = $software_key_id, contact_id = $contact_id"); + mysqli_query($mysqli, "INSERT IGNORE INTO software_contacts SET software_id = $software_id, contact_id = $contact_id"); + $holders[] = getFieldById('contacts', $contact_id, 'contact_name'); } - logAudit("Software", "Edit", "$session_name edited software $name", $client_id, $software_id); + logAudit("Software", "Keys", "$session_name updated a key on license " . escapeSql($row['software_name']) . ($holders ? ', handed to ' . escapeSql(implode(', ', $holders)) : ', not handed to anyone'), $client_id, $software_id); - flashAlert("Software $name updated"); + $warning = softwareSeatWarning($software_id); + flashAlert("Key on {$row['software_name']} saved" . ($holders ? ' - handed to ' . implode(', ', $holders) . '' : '') . $warning, $warning ? 'warning' : 'success'); + + redirect(); + +} + +if (isset($_GET['delete_software_key'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $software_key_id = intval($_GET['delete_software_key']); + $key_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT software_key_software_id FROM software_keys WHERE software_key_id = $software_key_id")); + if (!$key_row) { + flashAlert('That key no longer exists.', 'error'); + redirect(); + } + $row = softwareForRequest($key_row['software_key_software_id']); + + mysqli_query($mysqli, "DELETE FROM software_keys WHERE software_key_id = $software_key_id"); + + logAudit("Software", "Keys", "$session_name deleted a key from license " . escapeSql($row['software_name']), $client_id, intval($row['software_id'])); + + flashAlert("Key deleted from {$row['software_name']}", 'error'); redirect(); @@ -176,51 +318,35 @@ if (isset($_GET['archive_software'])) { enforceUserPermission('module_support', 2); - $software_id = intval($_GET['archive_software']); + $row = softwareForRequest($_GET['archive_software']); + $software_id = intval($row['software_id']); - // Get Software Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); + // Seats stay put - an archived license drops off every device and user + // anyway, and comes back with them if it is restored + mysqli_query($mysqli, "UPDATE software SET software_archived_at = NOW() WHERE software_id = $software_id"); - enforceClientAccess(); + logAudit("Software", "Archive", "$session_name archived license " . escapeSql($row['software_name']), $client_id, $software_id); - mysqli_query($mysqli,"UPDATE software SET software_archived_at = NOW() WHERE software_id = $software_id"); - - // Remove Software Relations - mysqli_query($mysqli,"DELETE FROM software_contacts WHERE software_id = $software_id"); - mysqli_query($mysqli,"DELETE FROM software_assets WHERE software_id = $software_id"); - - logAudit("Software", "Archive", "$session_name archived software $software_name and removed all device/user license associations", $client_id, $software_id); - - flashAlert("Software $software_name archived and removed all device/user license associations", 'error'); + flashAlert("License {$row['software_name']} archived", 'error'); redirect(); } -if(isset($_GET['restore_software'])){ +if (isset($_GET['restore_software'])) { validateCSRFToken(); enforceUserPermission('module_support', 2); - $software_id = intval($_GET['restore_software']); + $row = softwareForRequest($_GET['restore_software']); + $software_id = intval($row['software_id']); - // Get Software Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); + mysqli_query($mysqli, "UPDATE software SET software_archived_at = NULL WHERE software_id = $software_id"); - enforceClientAccess(); + logAudit("Software", "Restore", "$session_name restored license " . escapeSql($row['software_name']), $client_id, $software_id); - mysqli_query($mysqli,"UPDATE software SET software_archived_at = NULL WHERE software_id = $software_id"); - - logAudit("Software", "Restore", "$session_name restored software $software_name", $client_id, $software_id); - - flashAlert("Software $software_name restored"); + flashAlert("License {$row['software_name']} restored"); redirect(); @@ -232,21 +358,76 @@ if (isset($_GET['delete_software'])) { enforceUserPermission('module_support', 3); - $software_id = intval($_GET['delete_software']); + $row = softwareForRequest($_GET['delete_software']); + $software_id = intval($row['software_id']); - // Get Software Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT software_name, software_client_id FROM software WHERE software_id = $software_id"); - $row = mysqli_fetch_assoc($sql); - $software_name = escapeSql($row['software_name']); - $client_id = intval($row['software_client_id']); + // Seats, keys and links go with it (foreign keys cascade) + mysqli_query($mysqli, "DELETE FROM software WHERE software_id = $software_id"); - enforceClientAccess(); + logAudit("Software", "Delete", "$session_name deleted license " . escapeSql($row['software_name']) . " with its seats and keys", $client_id); - mysqli_query($mysqli,"DELETE FROM software WHERE software_id = $software_id"); + flashAlert("License {$row['software_name']} deleted", 'error'); - logAudit("Software", "Delete", "$session_name deleted software $software_name and removed all device/user license associations", $client_id); + // From its own page, back to the client's licenses - that page is gone + if (strpos($_SERVER['HTTP_REFERER'] ?? '', '/license.php') !== false) { + redirect("software.php?client_id=$client_id&archived=1"); + } + redirect(); - flashAlert("Software $software_name deleted and removed all device/user license associations", 'error'); +} + +if (isset($_POST['bulk_archive_software'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $rows = softwareBulkRows($_POST['software_ids'] ?? []); + foreach ($rows as $software_id => $row) { + $client_id = intval($row['software_client_id']); + mysqli_query($mysqli, "UPDATE software SET software_archived_at = NOW() WHERE software_id = $software_id AND software_archived_at IS NULL"); + logAudit("Software", "Archive", "$session_name archived license " . escapeSql($row['software_name']), $client_id, $software_id); + } + + flashAlert("Archived " . count($rows) . " license" . (count($rows) === 1 ? '' : 's'), 'error'); + + redirect(); + +} + +if (isset($_POST['bulk_restore_software'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 2); + + $rows = softwareBulkRows($_POST['software_ids'] ?? []); + foreach ($rows as $software_id => $row) { + $client_id = intval($row['software_client_id']); + mysqli_query($mysqli, "UPDATE software SET software_archived_at = NULL WHERE software_id = $software_id"); + logAudit("Software", "Restore", "$session_name restored license " . escapeSql($row['software_name']), $client_id, $software_id); + } + + flashAlert("Restored " . count($rows) . " license" . (count($rows) === 1 ? '' : 's')); + + redirect(); + +} + +if (isset($_POST['bulk_delete_software'])) { + + validateCSRFToken(); + + enforceUserPermission('module_support', 3); + + $rows = softwareBulkRows($_POST['software_ids'] ?? []); + foreach ($rows as $software_id => $row) { + $client_id = intval($row['software_client_id']); + mysqli_query($mysqli, "DELETE FROM software WHERE software_id = $software_id"); + logAudit("Software", "Delete", "$session_name deleted license " . escapeSql($row['software_name']) . " with its seats and keys", $client_id); + } + + flashAlert("Deleted " . count($rows) . " license" . (count($rows) === 1 ? '' : 's'), 'error'); redirect(); @@ -310,24 +491,52 @@ if (isExportRequest('export_software')) { $expire_query = ''; } + // Attention tab + $status_filters = softwareStatusFilters(); + $status = (string) ($_POST['status'] ?? ''); + $status_query = ''; + if (isset($status_filters[$status])) { + $status_query = "AND ({$status_filters[$status]['sql']})"; + $filter_summary['Showing'] = $status_filters[$status]['label']; + } + + // License type + $license_type_query = ''; + if (!empty($_POST['license_type'])) { + $license_type_query = "AND software_license_type = '" . escapeSql($_POST['license_type']) . "'"; + $filter_summary['License Type'] = $_POST['license_type']; + } + // Search Filter $q = escapeSql($_POST['q'] ?? ''); if (!empty($q)) { $filter_summary['Search'] = $_POST['q']; } + // Who is on each license, in the same query - not two more queries per row + mysqli_query($mysqli, "SET SESSION group_concat_max_len = 65535"); $sql = mysqli_query( $mysqli, "SELECT software_description, software_expire, software_id, software_key, software_license_type, - software_name, software_notes, software_purchase, software_seats, software_type, - software_version FROM software + software_name, software_notes, software_purchase, software_purchase_reference, software_seats, software_type, + software_version, client_name, vendor_name, + " . softwareSeatsUsedSql('software.software_id') . " AS seats_used, + (SELECT GROUP_CONCAT(asset_name ORDER BY asset_name SEPARATOR ', ') FROM software_assets AS sa + JOIN assets ON assets.asset_id = sa.asset_id AND asset_archived_at IS NULL WHERE sa.software_id = software.software_id) AS assigned_to_assets, + (SELECT GROUP_CONCAT(contact_name ORDER BY contact_name SEPARATOR ', ') FROM software_contacts AS sc + JOIN contacts ON contacts.contact_id = sc.contact_id AND contact_archived_at IS NULL WHERE sc.software_id = software.software_id) AS assigned_to_contacts, + (SELECT GROUP_CONCAT(sk.software_key ORDER BY sk.software_key_id SEPARATOR ', ') FROM software_keys AS sk WHERE sk.software_key_software_id = software.software_id) AS software_keys_list + FROM software LEFT JOIN clients ON client_id = software_client_id LEFT JOIN vendors ON vendor_id = software_vendor_id - WHERE (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%' OR client_name LIKE '%$q%') + WHERE (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%' OR client_name LIKE '%$q%' OR vendor_name LIKE '%$q%' + OR software.software_id IN (SELECT software_key_software_id FROM software_keys WHERE software_key LIKE '%$q%')) AND $archive_query " . clientScopeSql('software_client_id') . " $client_query $expire_query + $status_query + $license_type_query ORDER BY software_name ASC" ); @@ -337,35 +546,19 @@ if (isExportRequest('export_software')) { guardExportPdfRowCount($format, $num_rows); - $export = beginExport('software', $format, $file_name_prepend . 'Software', 'Software', summarizeExportFilters($filter_summary)); + $export = beginExport('software', $format, $file_name_prepend . 'Licenses', 'Licenses', summarizeExportFilters($filter_summary)); while ($row = mysqli_fetch_assoc($sql)) { - // Asset and contact licence lists, only when those columns are wanted - if (isset($export['columns']['assigned_to_assets'])) { - $software_id = intval($row['software_id']); - $assigned_to_assets = []; - $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_name FROM software_assets LEFT JOIN assets ON software_assets.asset_id = assets.asset_id WHERE software_id = $software_id"); - while ($asset_row = mysqli_fetch_assoc($asset_licenses_sql)) { - $assigned_to_assets[] = $asset_row['asset_name']; - } - $row['assigned_to_assets'] = implode(', ', $assigned_to_assets); - } - if (isset($export['columns']['assigned_to_contacts'])) { - $software_id = intval($row['software_id']); - $assigned_to_contacts = []; - $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_name FROM software_contacts LEFT JOIN contacts ON software_contacts.contact_id = contacts.contact_id WHERE software_id = $software_id"); - while ($contact_row = mysqli_fetch_assoc($contact_licenses_sql)) { - $assigned_to_contacts[] = $contact_row['contact_name']; - } - $row['assigned_to_contacts'] = implode(', ', $assigned_to_contacts); - } + $row['assigned_to_assets'] = (string) $row['assigned_to_assets']; + $row['assigned_to_contacts'] = (string) $row['assigned_to_contacts']; + $row['software_keys_list'] = (string) $row['software_keys_list']; addExportRow($export, $row); } finishExport($export); } - logAudit("Software", "Export", "$session_name exported $num_rows software(s) to a " . strtoupper($format) . " file", $client_id); + logAudit("Software", "Export", "$session_name exported $num_rows license(s) to a " . strtoupper($format) . " file", $client_id); exit; diff --git a/agent/software.php b/agent/software.php index bbe8e5c49..2a0706015 100644 --- a/agent/software.php +++ b/agent/software.php @@ -1,5 +1,14 @@ = 2; +// Deleting for good also needs Admin > Settings to allow destructive deletes +$can_delete = lookupUserPermission('module_support') >= 3 && !empty($config_destructive_deletes_enable); + +$client = ''; +if (!$client_url) { + // Client Filter + if (!empty($_GET['client'])) { + $client = intval($_GET['client']); + $client_query = "AND software_client_id = $client"; + } +} + +// Attention tabs - renewing, expired, over seats, nobody on it +$status_filters = softwareStatusFilters(); +$status = isset($status_filters[$_GET['status'] ?? '']) ? $_GET['status'] : ''; +$_GET['status'] = $status; +$status_query = $status ? "AND ({$status_filters[$status]['sql']})" : ''; + +// License type filter +$license_type_filter = (string) ($_GET['license_type'] ?? ''); +$license_type_query = $license_type_filter !== '' ? "AND software_license_type = '" . escapeSql($license_type_filter) . "'" : ''; + +// Expiring In Filter - the dashboard links here with expire_days=30 +if (!empty($_GET['expire_days'])) { if ($_GET['expire_days'] == "expired") { $expire_days = "expired"; $expire_query = "AND (software_expire IS NOT NULL AND software_expire != '0000-00-00' AND software_expire < CURDATE())"; @@ -49,177 +81,296 @@ if (isset($_GET['expire_days']) && !empty($_GET['expire_days'])) { $expire_query = ''; } -if (!$client_url) { - // Client Filter - if (isset($_GET['client']) & !empty($_GET['client'])) { - $client_query = 'AND (software_client_id = ' . intval($_GET['client']) . ')'; - $client = intval($_GET['client']); - } else { - // Default - any - $client_query = ''; - $client = ''; - } +// Extra columns, picked from the filter bar +$extra_column_options = [ + 'Key' => 'License key', + 'Purchased' => 'Purchased', + 'Order_Ref' => 'Order reference', +]; +$extra_columns = array_values(array_intersect(array_keys($extra_column_options), (array) ($_GET['show_column'] ?? []))); +$show_key = in_array('Key', $extra_columns, true); +$show_purchased = in_array('Purchased', $extra_columns, true); +$show_order_ref = in_array('Order_Ref', $extra_columns, true); + +// Only these sort - filter_header.php will hand through any lowercase word, and +// an unknown column takes the page down with a mysqli exception +$sortable_columns = [ + 'software_name', 'software_type', 'software_license_type', 'seats_used', 'software_seats', 'software_expire', + 'software_purchase', 'software_purchase_reference', 'vendor_name', 'client_name', 'software_created_at' +]; +if (!in_array($sort, $sortable_columns, true)) { + $sort = 'software_name'; +} +// No renewal date sorts last whichever way, so "soonest first" starts with a date +$order_by = $sort === 'software_expire' ? "software_expire IS NULL, software_expire $order, software_name ASC" : "$sort $order, software_name ASC"; + +$seats_used_sql = softwareSeatsUsedSql('software.software_id'); + +// Tab counts - within the client and archive scope, before the search narrows it +$count_columns = ["COUNT(*) AS all_count"]; +foreach ($status_filters as $status_key => $status_filter) { + $count_columns[] = "COALESCE(SUM({$status_filter['sql']}), 0) AS {$status_key}_count"; +} +$row = mysqli_fetch_assoc(mysqli_query($mysqli, " + SELECT " . implode(', ', $count_columns) . " + FROM software + LEFT JOIN clients ON client_id = software_client_id + WHERE $archive_query + " . clientScopeSql('software_client_id') . " + $client_query +")); +$tab_counts = ['' => intval($row['all_count'])]; +foreach (array_keys($status_filters) as $status_key) { + $tab_counts[$status_key] = intval($row["{$status_key}_count"]); } $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS client_id, client_name, software_created_at, software_description, software_expire, - software_id, software_license_type, software_name, software_seats, software_type, - software_version, software_archived_at, vendor_id, vendor_name FROM software + software_id, software_license_type, software_name, software_seats, software_type, software_key, software_favorite, + software_purchase, software_purchase_reference, software_version, software_archived_at, vendor_id, vendor_name, + $seats_used_sql AS seats_used, + (SELECT COUNT(*) FROM software_keys WHERE software_key_software_id = software.software_id) AS key_count + FROM software LEFT JOIN clients ON client_id = software_client_id LEFT JOIN vendors ON vendor_id = software_vendor_id - WHERE (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%' OR client_name LIKE '%$q%') + WHERE (software_name LIKE '%$q%' OR software_description LIKE '%$q%' OR software_type LIKE '%$q%' OR software_license_type LIKE '%$q%' + OR software_key LIKE '%$q%' OR software_purchase_reference LIKE '%$q%' OR vendor_name LIKE '%$q%' OR client_name LIKE '%$q%' + OR software.software_id IN (SELECT software_key_software_id FROM software_keys WHERE software_key LIKE '%$q%')) AND $archive_query " . clientScopeSql('software_client_id') . " $client_query + $status_query + $license_type_query $expire_query - ORDER BY $sort $order LIMIT $record_from, $record_to"); + ORDER BY $order_by LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +// License types in use here, for the filter +$license_type_options = []; +$sql_license_types = mysqli_query($mysqli, "SELECT DISTINCT software_license_type FROM software + LEFT JOIN clients ON client_id = software_client_id + WHERE software_license_type IS NOT NULL AND software_license_type != '' AND $archive_query + " . clientScopeSql('software_client_id') . " $client_query + ORDER BY software_license_type ASC"); +while ($license_type_row = mysqli_fetch_row($sql_license_types)) { + $license_type_options[] = $license_type_row[0]; +} + ?> -
-
-

Software & Licenses

-
-
- - -
+
+
+

Licenses

+
+ +
+ + +
+ + New from Template + + 0) { ?> +
- Create from Template + data-modal-url=""> + Export - 0) { ?> -
- - Export - + +
+
+ +
+
+ + + +
+ +
+ + +
+
+ + + + + +
+
+
+ + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+ + Archived + + +
-
-
- - - - - -
+ +
+
+ -
-
- - -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
- - -
-
- "> - Archived - -
-
- -
- -
- - text-nowrap"> +
+ text-nowrap table-light"> - + + + + + + + + + + + - - + @@ -233,113 +384,124 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $software_description = escapeHtml($row['software_description']); $software_version = escapeHtml($row['software_version']); $software_type = escapeHtml($row['software_type']); - $software_license_type = escapeHtml($row['software_license_type']) ?: '-'; - $software_seats = escapeHtml($row['software_seats']); - $software_expire = escapeHtml($row['software_expire']); + $software_license_type = escapeHtml($row['software_license_type']); + $software_purchase = escapeHtml($row['software_purchase']); + $software_purchase_reference = escapeHtml($row['software_purchase_reference']); + $software_favorite = intval($row['software_favorite']); $software_archived_at = escapeHtml($row['software_archived_at']); $vendor_name = escapeHtml($row['vendor_name']); $vendor_id = intval($row['vendor_id']); - if ($vendor_name) { - $vendor_display = "$vendor_name"; - } else { - $vendor_display = "N/A"; - } - if ($software_expire) { - $software_expire_ago = timeAgo($software_expire); - $software_expire_display = "
$software_expire
$software_expire_ago
"; - - // Convert the expiry date to a timestamp - $software_expire_timestamp = strtotime($row['software_expire']); - $current_timestamp = time(); // Get current timestamp - - // Calculate the difference in days - $days_until_expiry = ($software_expire_timestamp - $current_timestamp) / (60 * 60 * 24); - - // Determine the class based on the number of days until expiry - if ($days_until_expiry <= 0) { - $tr_class = "table-secondary"; - } elseif ($days_until_expiry <= 7) { - $tr_class = "table-danger"; - } elseif ($days_until_expiry <= 45) { - $tr_class = "table-warning"; - } else { - $tr_class = ''; - } - - } else { - $software_expire_display = "N/A"; - $tr_class = ''; - } - - $software_created_at = escapeHtml($row['software_created_at']); - - $seat_count = 0; - - // Asset Licenses - $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_id FROM software_assets WHERE software_id = $software_id"); - $asset_licenses_array = array(); - while ($row = mysqli_fetch_assoc($asset_licenses_sql)) { - $asset_licenses_array[] = intval($row['asset_id']); - $seat_count = $seat_count + 1; - } - $asset_licenses = implode(',', $asset_licenses_array); - - // Contact Licenses - $contact_licenses_sql = mysqli_query($mysqli, "SELECT contact_id FROM software_contacts WHERE software_id = $software_id"); - $contact_licenses_array = array(); - while ($row = mysqli_fetch_assoc($contact_licenses_sql)) { - $contact_licenses_array[] = intval($row['contact_id']); - $seat_count = $seat_count + 1; - } - $contact_licenses = implode(',', $contact_licenses_array); - - + $key_count = intval($row['key_count']); + $seats = softwareSeats($row['seats_used'], $row['software_seats']); + $renewal = softwareRenewal($row['software_expire']); + $license_url = "license.php?client_id=$client_id&software_id=$software_id"; ?> - - + + + + + + + + + + + + + + + + + + - - - - - - - +
- - Software + + +
+ +
+ 		+ + License - - Type + + Type - - License Type + + Seats - - Seats + + Renews Key + + Purchased + + + + Order ref + + - - Expire - - - + Vendor - + Client Action
- -
- -
-
$software_version" ?>
-
-
-
- +
+
+ +
+ 		+
+ +
+ + + + Archived +
+
+
+ 		+ +
+ +
-
+ +
+ 		+ +
+ +
+ + + + + - + + 		+ + +
individual key
+ + - + + 		-' ?> + + + + - + + + + + + - + -
- +
+
+
- - - Edit + + Quick look + + + + Edit + + + Seats + + + Renew
- Archive and
Remove Licenses + Archive - - - Restore - - - - +
- - Delete and
Remove Licenses + + Restore + + + + Delete +
@@ -347,18 +509,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- -
+ + +
+ +
+
+ + +
+ + dashboardCount("SELECT COUNT(software_id) FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL + AND " . softwareStatusFilters()['over']['sql']), + 'label' => 'Licenses over seats', 'icon' => 'cube', 'tone' => 'danger', + 'url' => "/agent/software.php?client_id=$client_id&status=over", + ]; + } + if ($access['docs'] && $renewals) { $expired = count(array_filter($renewals['items'], function ($r) { return $r['days'] < 0; })); $soon = count($renewals['items']) - $expired; @@ -145,11 +155,11 @@ function clientOverviewContacts($client_id, $limit = 6) { return $contacts; } -/** Starred assets and credentials. */ +/** Starred assets, licenses and credentials. */ function clientOverviewFavorites($client_id, $access) { global $mysqli; - $favorites = ['assets' => [], 'credentials' => []]; + $favorites = ['assets' => [], 'licenses' => [], 'credentials' => []]; if ($access['docs']) { $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type, asset_make, asset_model, interface_ip @@ -160,6 +170,14 @@ function clientOverviewFavorites($client_id, $access) { while ($row = mysqli_fetch_assoc($sql)) { $favorites['assets'][] = $row; } + + $sql = mysqli_query($mysqli, "SELECT software_id, software_name, software_type, software_license_type, software_key, software_expire + FROM software + WHERE software_client_id = $client_id AND software_favorite = 1 AND software_archived_at IS NULL + ORDER BY software_name"); + while ($row = mysqli_fetch_assoc($sql)) { + $favorites['licenses'][] = $row; + } } if ($access['credentials']) { @@ -260,7 +278,7 @@ function clientOverviewRenewals($client_id, $days = 45) { 'Certificate', "/agent/certificates.php?client_id=$client_id&q="], ['software', 'cube', "SELECT software_id AS id, software_name AS name, software_expire AS d FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL AND software_expire IS NOT NULL AND software_expire <= $window", - 'License', "/agent/software.php?client_id=$client_id&q="], + 'License', "/agent/license.php?client_id=$client_id&software_id="], ['warranty', 'shield-alt', "SELECT asset_id AS id, asset_name AS name, asset_warranty_expire AS d FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL AND asset_warranty_expire IS NOT NULL AND asset_warranty_expire <= $window", 'Warranty', "/agent/asset.php?client_id=$client_id&asset_id="], @@ -279,7 +297,7 @@ function clientOverviewRenewals($client_id, $days = 45) { 'kind' => $kind, 'icon' => $icon, 'label' => $label, 'name' => $row['name'], 'date' => $row['d'], 'days' => (int) $today->diff($date)->format('%r%a'), - 'url' => in_array($kind, ['warranty', 'retire'], true) ? $url . intval($row['id']) : $url . rawurlencode($row['name']), + 'url' => in_array($kind, ['warranty', 'retire', 'software'], true) ? $url . intval($row['id']) : $url . rawurlencode($row['name']), ]; } } diff --git a/functions/dashboard.php b/functions/dashboard.php index a8779973b..64d7d4046 100644 --- a/functions/dashboard.php +++ b/functions/dashboard.php @@ -282,7 +282,7 @@ function dashboardAttention($access) { $items[] = [ 'count' => dashboardCount("SELECT COUNT(software_id) FROM software WHERE software_archived_at IS NULL AND software_expire $soon " . clientScopeSql('software_client_id')), 'label' => 'Licenses expiring', 'icon' => 'cube', 'tone' => 'warning', 'detail' => 'Next 30 days', - 'url' => '/agent/software.php?expire_days=30&sort=software_expire&order=ASC', + 'url' => '/agent/software.php?status=renewing&sort=software_expire&order=ASC', ]; $items[] = [ 'count' => dashboardCount("SELECT COUNT(asset_id) FROM assets WHERE asset_archived_at IS NULL AND asset_warranty_expire $soon " . clientScopeSql('asset_client_id')), diff --git a/functions/export.php b/functions/export.php index f9d9f7a9d..ab749765a 100644 --- a/functions/export.php +++ b/functions/export.php @@ -182,7 +182,7 @@ function getExportColumns($export_type) { 'credential_uri' => ['label' => 'URI', 'weight' => 2], ], - // assigned_to_assets / assigned_to_contacts are built by the handler + // seats_used, assigned_to_assets / assigned_to_contacts and software_keys_list are built by the handler's query 'software' => [ 'software_name' => ['label' => 'Name', 'weight' => 2], 'software_version' => ['label' => 'Version'], @@ -190,11 +190,16 @@ function getExportColumns($export_type) { 'software_type' => ['label' => 'Type'], 'software_license_type' => ['label' => 'License Type'], 'software_seats' => ['label' => 'Seats', 'format' => 'number'], + 'seats_used' => ['label' => 'Seats Used', 'format' => 'number'], 'software_key' => ['label' => 'Key', 'weight' => 2], + 'software_keys_list' => ['label' => 'Individual Keys', 'weight' => 3, 'default' => false], 'assigned_to_assets' => ['label' => 'Assets', 'weight' => 2], 'assigned_to_contacts' => ['label' => 'Contacts', 'weight' => 2], + 'vendor_name' => ['label' => 'Vendor', 'default' => false], + 'software_purchase_reference' => ['label' => 'Order Ref', 'default' => false], 'software_purchase' => ['label' => 'Purchased'], 'software_expire' => ['label' => 'Expires'], + 'client_name' => ['label' => 'Client', 'default' => false], 'software_notes' => ['label' => 'Notes', 'weight' => 3], ], diff --git a/functions/links.php b/functions/links.php index 65cbf1572..71524ce9e 100644 --- a/functions/links.php +++ b/functions/links.php @@ -3,7 +3,9 @@ /* * Links between documents, files and the things they are about - the assets, * contacts, licenses and vendors a document covers, the files attached to a - * document, the assets and contacts a file belongs to. + * document, the assets and contacts a file belongs to - and the seats on a + * license (the devices and users on it) and the credentials and files that + * go with it. * * Every link is a row in a two-column table (asset_documents, document_files, * contact_files...) and they all work the same way, so they are described once @@ -12,6 +14,9 @@ * (agent/post/link.php) and one list (linkGroupsHtml()) on the document page * and the file and document quick looks. * + * A type with a 'view' module (credentials) is only offered, listed or + * linked for an agent who may see that module. + * * A link only ever joins two records of the same client, and never to an * archived one; linkAdd() checks both rather than trusting the form. */ @@ -23,13 +28,16 @@ const LINK_ENTITIES = [ 'document' => ['table' => 'documents', 'id' => 'document_id', 'name' => 'document_name', 'client' => 'document_client_id', 'archived' => 'document_archived_at', 'label' => 'document', 'plural' => 'Documents', 'icon' => 'fa-file-alt'], 'file' => ['table' => 'files', 'id' => 'file_id', 'name' => 'file_name', 'client' => 'file_client_id', 'archived' => 'file_archived_at', 'label' => 'file', 'plural' => 'Files', 'icon' => 'fa-paperclip'], 'software' => ['table' => 'software', 'id' => 'software_id', 'name' => 'software_name', 'client' => 'software_client_id', 'archived' => 'software_archived_at', 'label' => 'license', 'plural' => 'Licenses', 'icon' => 'fa-cube'], + 'credential' => ['table' => 'credentials', 'id' => 'credential_id', 'name' => 'credential_name', 'client' => 'credential_client_id', 'archived' => 'credential_archived_at', 'label' => 'credential', 'plural' => 'Credentials', 'icon' => 'fa-key', 'view' => 'module_credential'], 'vendor' => ['table' => 'vendors', 'id' => 'vendor_id', 'name' => 'vendor_name', 'client' => 'vendor_client_id', 'archived' => 'vendor_archived_at', 'label' => 'vendor', 'plural' => 'Vendors', 'icon' => 'fa-building'], ]; /** * Which pairs can be linked, keyed by the two types in alphabetical order, and * the permission it takes. Linking a contact to a file has always been a - * contacts permission; everything else is documentation, a support one. + * contacts permission, a credential to a license a credentials one; + * everything else is documentation, a support one. A device or user linked + * to a license holds a seat on it. */ const LINK_RELATIONS = [ 'asset|document' => ['table' => 'asset_documents', 'module' => 'module_support'], @@ -39,6 +47,10 @@ const LINK_RELATIONS = [ 'document|vendor' => ['table' => 'vendor_documents', 'module' => 'module_support'], 'asset|file' => ['table' => 'asset_files', 'module' => 'module_support'], 'contact|file' => ['table' => 'contact_files', 'module' => 'module_client'], + 'asset|software' => ['table' => 'software_assets', 'module' => 'module_support'], + 'contact|software' => ['table' => 'software_contacts', 'module' => 'module_support'], + 'credential|software' => ['table' => 'software_credentials', 'module' => 'module_credential'], + 'file|software' => ['table' => 'software_files', 'module' => 'module_support'], ]; /** The relation between two types, or null when they cannot be linked. */ @@ -48,11 +60,17 @@ function linkRelation($a, $b) { return LINK_RELATIONS[implode('|', $pair)] ?? null; } -/** What a $from record can be linked to, in the order the pages list them. */ +/** + * What a $from record can be linked to, in the order the pages list them - + * a license's seats first - leaving out types this agent may not see. + */ function linkTypesFor($from) { - $order = ['file', 'document', 'asset', 'contact', 'software', 'vendor']; + $order = $from === 'software' + ? ['asset', 'contact', 'credential', 'document', 'file'] + : ['file', 'document', 'asset', 'contact', 'software', 'credential', 'vendor']; return array_values(array_filter($order, function ($to) use ($from) { - return $to !== $from && linkRelation($from, $to); + $view = LINK_ENTITIES[$to]['view'] ?? null; + return $to !== $from && linkRelation($from, $to) && (!$view || lookupUserPermission($view) >= 1); })); } @@ -83,7 +101,8 @@ function linkDisplayColumns($type) { 'contact' => 'contact_title, contact_photo, contact_client_id', 'document' => 'document_description, document_updated_at, document_created_at', 'file' => 'file_ext, file_size, file_mime_type, file_description', - 'software' => 'software_type, software_version', + 'software' => 'software_type, software_version, software_license_type, software_seats, software_expire, ' . softwareSeatsUsedSql('t.software_id') . ' AS seats_used', + 'credential' => 'credential_description, credential_uri, credential_username, credential_otp_secret, credential_favorite', 'vendor' => 'vendor_description', ][$type] ?? ''; } @@ -152,9 +171,9 @@ function linkCounts($from, $id) { return $counts; } -/** The audit log entry a link change is filed under - the document or file side of it. */ +/** The audit log entry a link change is filed under - the document, file or license side of it. */ function linkLogSide($from, $id, $to, $other_id) { - foreach (['document', 'file'] as $side) { + foreach (['document', 'file', 'software'] as $side) { if ($from === $side) { return [ucfirst($side), $id]; } @@ -217,6 +236,14 @@ function linkRemove($from, $id, $to, $other_id) { if (mysqli_affected_rows($mysqli) < 1) { return ''; } + // A device or user off a license gives back any of its keys they had + foreach (['asset', 'contact'] as $holder) { + if ([$from, $to] === ['software', $holder]) { + softwareFreeKeys($source['id'], $holder, $other['id']); + } elseif ([$from, $to] === [$holder, 'software']) { + softwareFreeKeys($other['id'], $holder, $source['id']); + } + } [$log_type, $log_id] = linkLogSide($from, intval($source['id']), $to, intval($other['id'])); $log_from = $log_type === ucfirst($from) ? $source['name'] : $other['name']; $log_other = $log_type === ucfirst($from) ? $other['name'] : $source['name']; @@ -272,9 +299,20 @@ function linkRowHtml($to, $row, $client_id) { $detail = 'Updated ' . timeAgo($row['document_updated_at'] ?: $row['document_created_at']); break; case 'software': - $lead = ''; - $link = "$name"; - $detail = trim($row['software_type'] . ' ' . $row['software_version']); + $lead = softwareTile($row['software_type'], 'sm'); + $link = "$name"; + $seats = softwareSeats($row['seats_used'] ?? 0, $row['software_seats'] ?? 0); + $renewal = softwareRenewal($row['software_expire'] ?? ''); + $detail = implode(' · ', array_filter([ + $row['software_license_type'] ?? '', + $seats['state'] === 'unlimited' ? '' : $seats['used'] . ' / ' . $seats['total'] . ' seats', + $renewal && $renewal['state'] !== 'active' ? $renewal['text'] : '', + ])); + break; + case 'credential': + $lead = ''; + $link = "$name"; + $detail = $row['credential_description'] ?: $row['credential_uri']; break; case 'vendor': $lead = ''; diff --git a/functions/search.php b/functions/search.php index be674f416..e5eb1aabb 100644 --- a/functions/search.php +++ b/functions/search.php @@ -214,6 +214,32 @@ function globalSearchGroups($terms, $deep) { }, ]; + // Licenses by name, vendor and order reference - and by key, so a key read + // off a sticker or a screen finds the license it belongs to + $groups[] = [ + 'key' => 'licenses', 'label' => 'Licenses', 'icon' => 'cube', 'module' => 'module_support', + 'select' => 'software.software_id, software_name, software_version, software_license_type, software_expire, software_client_id, client_name, vendor_name', + 'from' => 'software + LEFT JOIN clients ON software_client_id = client_id + LEFT JOIN vendors ON vendor_id = software_vendor_id', + 'where' => "software_archived_at IS NULL + AND (software_name LIKE '%$like%' OR software_description LIKE '%$like%' OR software_key LIKE '%$like%' + OR software_purchase_reference LIKE '%$like%' OR vendor_name LIKE '%$like%' + OR software.software_id IN (SELECT software_key_software_id FROM software_keys WHERE software_key LIKE '%$like%'))", + 'scope' => 'software_client_id', + 'order' => "(software_key = '$eq') DESC, (software_name = '$eq') DESC, (software_name LIKE '$like%') DESC, software_name", + 'list_url' => '/agent/software.php?' . http_build_query(['q' => $q]), + 'item' => function ($row) { + $renewal = softwareRenewal($row['software_expire']); + return [ + 'title' => trim($row['software_name'] . ' ' . $row['software_version']), + 'subtitle' => implode(' · ', array_filter([$row['software_license_type'], $row['vendor_name'], $renewal && $renewal['state'] !== 'active' ? $renewal['text'] : ''])), + 'context' => $row['client_name'], + 'url' => globalSearchClientUrl('license.php', $row['software_client_id'], ['software_id' => intval($row['software_id'])]), + ]; + }, + ]; + // Name and description only. Usernames and passwords are encrypted at rest, // and the results page reveals passwords through the audited endpoint, never // in the markup. diff --git a/functions/software.php b/functions/software.php new file mode 100644 index 000000000..791c38ae2 --- /dev/null +++ b/functions/software.php @@ -0,0 +1,609 @@ + 'fa-sync-alt', + 'Device' => 'fa-desktop', + 'User' => 'fa-user', + 'Site' => 'fa-building', + 'Concurrent' => 'fa-users', + 'Perpetual' => 'fa-infinity', + 'Trial' => 'fa-hourglass-half', + 'Usage-based' => 'fa-tachometer-alt', + 'Open Source' => 'fa-code-branch', +]; + +/** The icon for a license type, typed or from the list. */ +function softwareLicenseTypeIcon($license_type) { + $license_type = html_entity_decode((string) $license_type, ENT_QUOTES, 'UTF-8'); + return SOFTWARE_LICENSE_TYPES[$license_type] ?? 'fa-certificate'; +} + +/** + * The icon and colour for a kind of software (Admin > Categories, software + * types). An icon set on the category wins; otherwise it is read from the + * name, so "Security Software" is a red shield and "Software as a Service" a + * cloud. The colours are the asset tones (css: .itflow-asset-tone-*). + */ +function softwareTypeStyle($software_type) { + global $mysqli; + static $category_icons = null; + + if ($category_icons === null) { + $category_icons = []; + $sql = mysqli_query($mysqli, "SELECT category_name, category_icon FROM categories + WHERE category_type = 'software_type' AND category_icon IS NOT NULL AND category_icon != ''"); + while ($row = mysqli_fetch_assoc($sql)) { + if (preg_match('/^fa-[a-z0-9-]+$/', $row['category_icon'])) { + $category_icons[strtolower($row['category_name'])] = $row['category_icon']; + } + } + } + + $type = strtolower(trim(html_entity_decode((string) $software_type, ENT_QUOTES, 'UTF-8'))); + + // First match wins - "Operating System" before "System Software" + $styles = [ + 'saas' => ['fa-cloud', 'wireless'], + 'service' => ['fa-cloud', 'wireless'], + 'cloud' => ['fa-cloud', 'wireless'], + 'productivity' => ['fa-briefcase', 'workstation'], + 'office' => ['fa-briefcase', 'workstation'], + 'security' => ['fa-shield-alt', 'firewall'], + 'antivirus' => ['fa-shield-alt', 'firewall'], + 'backup' => ['fa-hdd', 'network'], + 'web' => ['fa-globe', 'network'], + 'mobile' => ['fa-mobile-alt', 'phone'], + 'operating' => ['fa-layer-group', 'virtual'], + 'system' => ['fa-cogs', 'server'], + 'desktop' => ['fa-window-maximize', 'peripheral'], + ]; + $style = ['fa-cube', 'other']; + foreach ($styles as $needle => $candidate) { + if ($type !== '' && strpos($type, $needle) !== false) { + $style = $candidate; + break; + } + } + if (isset($category_icons[$type])) { + $style[0] = $category_icons[$type]; + } + + return ['icon' => $style[0], 'tone' => $style[1]]; +} + +/** The tile for a license - its software type's icon on that type's colour. $size '' | 'sm' | 'lg'. */ +function softwareTile($software_type, $size = '') { + $style = softwareTypeStyle($software_type); + $size_class = in_array($size, ['sm', 'lg'], true) ? " itflow-asset-icon-$size" : ''; + return ''; +} + +/** + * Where a renewal date stands - null without one. 'state' is expired, soon + * (within $soon_days) or active; 'short' fits a pill, 'text' a sentence. + */ +function softwareRenewal($expire, $soon_days = 30) { + $expire = trim((string) $expire); + if ($expire === '' || strpos($expire, '0000-00-00') === 0) { + return null; + } + $date = DateTime::createFromFormat('!Y-m-d', substr($expire, 0, 10)); + if (!$date) { + return null; + } + $days = (int) (new DateTime('today'))->diff($date)->format('%r%a'); + $ymd = $date->format('Y-m-d'); + + if ($days < 0) { + $ago = -$days; + $text = $ago === 1 ? 'Expired yesterday' : ($ago < 60 ? "Expired $ago days ago" : 'Expired ' . timeAgo($ymd)); + return ['state' => 'expired', 'tone' => 'danger', 'short' => 'Expired', 'text' => $text, 'days' => $days, 'date' => $ymd]; + } + if ($days <= $soon_days) { + $text = $days === 0 ? 'Renews today' : ($days === 1 ? 'Renews tomorrow' : "Renews in $days days"); + return ['state' => 'soon', 'tone' => $days <= 7 ? 'danger' : 'warning', 'short' => $text, 'text' => $text, 'days' => $days, 'date' => $ymd]; + } + return ['state' => 'active', 'tone' => 'success', 'short' => 'Active', 'text' => 'Renews ' . timeAgo($ymd), 'days' => $days, 'date' => $ymd]; +} + +/** A renewal as a soft pill - expired red, soon amber, otherwise green. */ +function softwareRenewalPill($renewal, $use_text = false) { + if (!$renewal) { + return ''; + } + $tone = $renewal['tone']; + $icon = ['expired' => 'fa-calendar-times', 'soon' => 'fa-hourglass-half', 'active' => 'fa-calendar-check'][$renewal['state']]; + return '' + . '' . escapeHtml($use_text ? $renewal['text'] : $renewal['short']) . ''; +} + +/** + * Seats in use against seats bought. 'state' is over, full, unused, ok - or + * unlimited when the license has no seat count. + */ +function softwareSeats($used, $total) { + $used = intval($used); + $total = intval($total); + if ($total <= 0) { + return ['used' => $used, 'total' => 0, 'free' => null, 'over' => 0, 'pct' => 0, 'state' => 'unlimited', 'tone' => 'secondary', + 'text' => $used === 1 ? '1 in use' : "$used in use", 'title' => "$used in use, no seat limit"]; + } + $over = max(0, $used - $total); + $free = max(0, $total - $used); + $state = $over ? 'over' : ($free === 0 ? 'full' : ($used === 0 ? 'unused' : 'ok')); + $text = ['over' => "$over over", 'full' => 'All in use', 'unused' => 'None in use', 'ok' => "$free free"][$state]; + return [ + 'used' => $used, 'total' => $total, 'free' => $free, 'over' => $over, + 'pct' => min(100, (int) round($used / $total * 100)), + 'state' => $state, + 'tone' => ['over' => 'danger', 'full' => 'warning', 'unused' => 'secondary', 'ok' => 'primary'][$state], + 'text' => $text, + 'title' => "$used of $total seats in use" . ($over ? " - $over over" : ''), + ]; +} + +/** Seats as "3 / 5" over a thin bar, and what is left - or "4 in use" for a license without a limit. */ +function softwareSeatBar($seats, $show_text = true) { + $text = $show_text ? '
' . escapeHtml($seats['text']) . '
' : ''; + if ($seats['state'] === 'unlimited') { + return '
' . $seats['used'] . ' in use' + . ($show_text ? '
No seat limit
' : '') . '
'; + } + return '
' + . '
' . $seats['used'] . '/ ' . $seats['total'] . '
' + . '
' + . '
' + . $text . '
'; +} + +/** SQL for the seats in use on the license in $software_column - devices plus users, archived ones left out. */ +function softwareSeatsUsedSql($software_column = 'software.software_id') { + return "((SELECT COUNT(*) FROM software_assets AS seat_a JOIN assets AS seat_aa ON seat_aa.asset_id = seat_a.asset_id AND seat_aa.asset_archived_at IS NULL WHERE seat_a.software_id = $software_column) + + (SELECT COUNT(*) FROM software_contacts AS seat_c JOIN contacts AS seat_cc ON seat_cc.contact_id = seat_c.contact_id AND seat_cc.contact_archived_at IS NULL WHERE seat_c.software_id = $software_column))"; +} + +/** + * The list's attention tabs - each a WHERE fragment on the software table. + * Renewing is the same 30 days the dashboard counts. + */ +function softwareStatusFilters() { + $used = softwareSeatsUsedSql('software.software_id'); + return [ + 'renewing' => ['label' => 'Renewing soon', 'icon' => 'fa-hourglass-half', 'title' => 'Renewing in the next 30 days', + 'sql' => "software_expire IS NOT NULL AND software_expire BETWEEN CURDATE() AND CURDATE() + INTERVAL 30 DAY"], + 'expired' => ['label' => 'Expired', 'icon' => 'fa-calendar-times', 'title' => 'Past their renewal date', + 'sql' => "software_expire IS NOT NULL AND software_expire != '0000-00-00' AND software_expire < CURDATE()"], + 'over' => ['label' => 'Over seats', 'icon' => 'fa-exclamation-triangle', 'title' => 'More devices and users than seats bought', + 'sql' => "software_seats > 0 AND $used > software_seats"], + 'unused' => ['label' => 'No seats assigned', 'icon' => 'fa-user-slash', 'title' => 'Nobody and nothing on them yet', + 'sql' => "$used = 0"], + ]; +} + +/** A license key, monospace, with a copy button - long keys are cut short on screen but copy whole. */ +function softwareKeyHtml($key, $class = '') { + $key = escapeHtml($key); + if ($key === '') { + return ''; + } + return '' . $key . '' + . ''; +} + +/** One license by id with its client, vendor and seats in use - raw, or null. */ +function softwareRow($software_id) { + global $mysqli; + $software_id = intval($software_id); + if (!$software_id) { + return null; + } + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT software.*, client_id, client_name, + vendor_id, vendor_name, vendor_description, vendor_account_number, vendor_phone, vendor_phone_country_code, vendor_extension, + vendor_email, vendor_website, vendor_hours, vendor_sla, vendor_archived_at, + " . softwareSeatsUsedSql('software.software_id') . " AS seats_used + FROM software + LEFT JOIN clients ON client_id = software_client_id + LEFT JOIN vendors ON vendor_id = software_vendor_id + WHERE software_id = $software_id + LIMIT 1")); + return $row ?: null; +} + +/** + * The devices and users on a license, each with the keys handed to them. + * Archived ones are left out - they do not use a seat. + */ +function softwareSeatHolders($software_id) { + global $mysqli; + $software_id = intval($software_id); + + $holders = ['assets' => [], 'contacts' => []]; + + $sql = mysqli_query($mysqli, "SELECT assets.asset_id, asset_name, asset_type, asset_make, asset_model, asset_client_id, + asset_contact_id, contacts.contact_name AS asset_contact_name, contacts.contact_photo AS asset_contact_photo, + (SELECT GROUP_CONCAT(k.software_key ORDER BY k.software_key_id SEPARATOR '\n') FROM software_keys AS k + JOIN software_key_asset_assignments AS ka ON ka.software_key_id = k.software_key_id + WHERE k.software_key_software_id = $software_id AND ka.asset_id = assets.asset_id) AS held_keys + FROM software_assets + JOIN assets ON assets.asset_id = software_assets.asset_id + LEFT JOIN contacts ON contacts.contact_id = asset_contact_id + WHERE software_assets.software_id = $software_id AND asset_archived_at IS NULL + ORDER BY asset_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $row['held_keys'] = $row['held_keys'] !== null ? explode("\n", $row['held_keys']) : []; + $holders['assets'][] = $row; + } + + $sql = mysqli_query($mysqli, "SELECT contacts.contact_id, contact_name, contact_title, contact_email, contact_photo, contact_client_id, + (SELECT GROUP_CONCAT(k.software_key ORDER BY k.software_key_id SEPARATOR '\n') FROM software_keys AS k + JOIN software_key_contact_assignments AS kc ON kc.software_key_id = k.software_key_id + WHERE k.software_key_software_id = $software_id AND kc.contact_id = contacts.contact_id) AS held_keys + FROM software_contacts + JOIN contacts ON contacts.contact_id = software_contacts.contact_id + WHERE software_contacts.software_id = $software_id AND contact_archived_at IS NULL + ORDER BY contact_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $row['held_keys'] = $row['held_keys'] !== null ? explode("\n", $row['held_keys']) : []; + $holders['contacts'][] = $row; + } + + return $holders; +} + +/** A license's individual keys, oldest first, each with the devices and users it is handed to. */ +function softwareKeys($software_id) { + global $mysqli; + $software_id = intval($software_id); + + $keys = []; + $sql = mysqli_query($mysqli, "SELECT software_key_id, software_key FROM software_keys WHERE software_key_software_id = $software_id ORDER BY software_key_id ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $keys[intval($row['software_key_id'])] = ['id' => intval($row['software_key_id']), 'key' => $row['software_key'], 'assets' => [], 'contacts' => []]; + } + if (!$keys) { + return []; + } + + $ids = implode(',', array_keys($keys)); + $sql = mysqli_query($mysqli, "SELECT ka.software_key_id, assets.asset_id, asset_name, asset_type, asset_archived_at FROM software_key_asset_assignments AS ka + JOIN assets ON assets.asset_id = ka.asset_id WHERE ka.software_key_id IN ($ids) ORDER BY asset_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $keys[intval($row['software_key_id'])]['assets'][] = $row; + } + $sql = mysqli_query($mysqli, "SELECT kc.software_key_id, contacts.contact_id, contact_name, contact_photo, contact_client_id, contact_archived_at FROM software_key_contact_assignments AS kc + JOIN contacts ON contacts.contact_id = kc.contact_id WHERE kc.software_key_id IN ($ids) ORDER BY contact_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $keys[intval($row['software_key_id'])]['contacts'][] = $row; + } + + return array_values($keys); +} + +/** + * The licenses one device ($kind 'asset') or user ('contact') holds a seat + * on - not archived - with each license's seats in use and the keys handed to + * this holder. For the Licenses tab on the asset and contact pages and quick looks. + */ +function softwareHeldBy($kind, $holder_id) { + global $mysqli; + $holder_id = intval($holder_id); + if ($kind === 'asset') { + [$seat_table, $holder_column, $assign_table] = ['software_assets', 'asset_id', 'software_key_asset_assignments']; + } elseif ($kind === 'contact') { + [$seat_table, $holder_column, $assign_table] = ['software_contacts', 'contact_id', 'software_key_contact_assignments']; + } else { + return []; + } + + $sql = mysqli_query($mysqli, "SELECT software.software_id, software_name, software_version, software_type, software_license_type, + software_seats, software_expire, software_key, software_client_id, vendor_name, + " . softwareSeatsUsedSql('software.software_id') . " AS seats_used, + (SELECT GROUP_CONCAT(k.software_key ORDER BY k.software_key_id SEPARATOR '\n') FROM software_keys AS k + JOIN $assign_table AS a ON a.software_key_id = k.software_key_id + WHERE k.software_key_software_id = software.software_id AND a.$holder_column = $holder_id) AS held_keys + FROM $seat_table AS h + JOIN software ON software.software_id = h.software_id + LEFT JOIN vendors ON vendor_id = software_vendor_id + WHERE h.$holder_column = $holder_id AND software_archived_at IS NULL + ORDER BY software_name ASC"); + $rows = []; + while ($row = mysqli_fetch_assoc($sql)) { + $row['held_keys'] = $row['held_keys'] !== null ? explode("\n", $row['held_keys']) : []; + $rows[] = $row; + } + return $rows; +} + +/** + * The Licenses tab on the asset and contact pages: each license this device + * or user holds, opening its quick look, with its seats, renewal and the key + * to install - theirs if one was handed to them, otherwise the license key. + * $rows from softwareHeldBy(). + */ +function softwareHeldTable($rows, $kind, $holder_id, $can_edit) { + $holder_id = intval($holder_id); + $html = '
' + . ''; + foreach ($rows as $row) { + $software_id = intval($row['software_id']); + $renewal = softwareRenewal($row['software_expire']); + $sub = implode(' · ', array_filter([$row['software_license_type'], $row['software_version']])); + $keys = $row['held_keys']; + $key_html = ''; + foreach ($keys as $key) { + $key_html .= '
' . softwareKeyHtml($key) . '
'; + } + if (!$keys && $row['software_key']) { + $key_html = softwareKeyHtml($row['software_key']) . '
License key
'; + } + $renew_html = $renewal + ? escapeHtml($renewal['date']) . '
' . escapeHtml($renewal['text']) . '
' + : '-'; + $unlink = $can_edit + ? '' + : ''; + $html .= '' + . '' + . '' + . '' + . '' + . '' + . ''; + } + return $html . '
LicenseSeatsRenewsKey
' . softwareTile($row['software_type'], 'sm') . '
' + . '' . escapeHtml($row['software_name']) . '' + . ($sub !== '' ? '
' . escapeHtml($sub) . '
' : '') + . '
' . softwareSeatBar(softwareSeats($row['seats_used'], $row['software_seats'])) . '' . $renew_html . '' . ($key_html !== '' ? $key_html : '-') . '' . $unlink . '
'; +} + +/** The same, as the short list in the asset and contact quick looks. */ +function softwareHeldList($rows) { + $html = '
    '; + foreach ($rows as $row) { + $seats = softwareSeats($row['seats_used'], $row['software_seats']); + $renewal = softwareRenewal($row['software_expire']); + $detail = implode(' · ', array_filter([ + $row['software_license_type'], + $seats['state'] === 'unlimited' ? '' : $seats['used'] . ' / ' . $seats['total'] . ' seats', + $renewal ? $renewal['text'] : '', + ])); + $key = $row['held_keys'][0] ?? $row['software_key']; + $tone = $seats['state'] === 'over' || ($renewal && $renewal['state'] === 'expired') ? 'danger-emphasis' : ($renewal && $renewal['state'] === 'soon' ? 'warning-emphasis' : 'body-secondary'); + $html .= '
  • ' . softwareTile($row['software_type'], 'sm') + . '
    ' . escapeHtml($row['software_name']) . '
    ' + . ($detail !== '' ? '
    ' . escapeHtml($detail) . '
    ' : '') . '
    ' + . ($key ? '' . softwareKeyHtml($key) . '' : '') + . '
    • '; + } + return $html . '
'; +} + +/** + * Of $ids, the devices ($kind 'asset') or users ('contact') that belong to + * $client_id and are not archived - what a form may put on a license. + */ +function softwareClientIds($kind, $ids, $client_id) { + global $mysqli; + $ids = array_values(array_unique(array_filter(array_map('intval', (array) $ids)))); + $client_id = intval($client_id); + if (!$ids || !$client_id) { + return []; + } + [$table, $id_column, $client_column, $archived_column] = $kind === 'asset' + ? ['assets', 'asset_id', 'asset_client_id', 'asset_archived_at'] + : ['contacts', 'contact_id', 'contact_client_id', 'contact_archived_at']; + $sql = mysqli_query($mysqli, "SELECT $id_column FROM $table WHERE $id_column IN (" . implode(',', $ids) . ") AND $client_column = $client_id AND $archived_column IS NULL"); + $valid = []; + while ($row = mysqli_fetch_row($sql)) { + $valid[] = intval($row[0]); + } + return $valid; +} + +/** Take back any of this license's keys handed to a device or user that has lost its seat. */ +function softwareFreeKeys($software_id, $kind, $holder_id) { + global $mysqli; + $software_id = intval($software_id); + $holder_id = intval($holder_id); + [$assign_table, $holder_column] = $kind === 'asset' + ? ['software_key_asset_assignments', 'asset_id'] + : ['software_key_contact_assignments', 'contact_id']; + mysqli_query($mysqli, "DELETE a FROM $assign_table AS a JOIN software_keys AS k ON k.software_key_id = a.software_key_id + WHERE k.software_key_software_id = $software_id AND a.$holder_column = $holder_id"); +} + +/** + * Make a license's devices and users exactly these - adding the new ones and + * dropping the rest (their keys go back to the pool). Only the license's own + * client's, unarchived records are taken; archived holders are left alone. + * Returns the names added and removed, for the log. + */ +function softwareSyncSeats($software_id, $client_id, $asset_ids, $contact_ids) { + global $mysqli; + $software_id = intval($software_id); + + $changes = ['added' => [], 'removed' => []]; + $kinds = [ + 'asset' => ['software_assets', 'assets', 'asset_id', 'asset_name', 'asset_archived_at', $asset_ids], + 'contact' => ['software_contacts', 'contacts', 'contact_id', 'contact_name', 'contact_archived_at', $contact_ids], + ]; + foreach ($kinds as $kind => [$seat_table, $table, $id_column, $name_column, $archived_column, $wanted]) { + $wanted = softwareClientIds($kind, $wanted, $client_id); + + $current = []; + $sql = mysqli_query($mysqli, "SELECT s.$id_column, $name_column FROM $seat_table AS s JOIN $table AS t ON t.$id_column = s.$id_column + WHERE s.software_id = $software_id AND t.$archived_column IS NULL"); + while ($row = mysqli_fetch_row($sql)) { + $current[intval($row[0])] = $row[1]; + } + + foreach (array_diff($wanted, array_keys($current)) as $id) { + mysqli_query($mysqli, "INSERT IGNORE INTO $seat_table SET software_id = $software_id, $id_column = $id"); + if (mysqli_affected_rows($mysqli) > 0) { + $changes['added'][] = getFieldById($table, $id, $name_column); + } + } + foreach (array_diff(array_keys($current), $wanted) as $id) { + mysqli_query($mysqli, "DELETE FROM $seat_table WHERE software_id = $software_id AND $id_column = $id"); + softwareFreeKeys($software_id, $kind, $id); + $changes['removed'][] = $current[$id]; + } + } + return $changes; +} + +/** One line for the log about seats a save changed - '' when it changed none. */ +function softwareSeatChangeText($changes) { + $parts = []; + if ($changes['added']) { + $parts[] = 'added ' . implode(', ', $changes['added']); + } + if ($changes['removed']) { + $parts[] = 'removed ' . implode(', ', $changes['removed']); + } + return $parts ? ' (seats: ' . implode('; ', $parts) . ')' : ''; +} + +/** A warning to add to the alert when a license has gone over its seats, or ''. */ +function softwareSeatWarning($software_id) { + $row = softwareRow($software_id); + if (!$row) { + return ''; + } + $seats = softwareSeats($row['seats_used'], $row['software_seats']); + if ($seats['state'] !== 'over') { + return ''; + } + // Raw name - flash messages are escaped when shown (alertMessageHtml) + return ' - ' . $row['software_name'] . ' is now over its seats, ' . $seats['used'] . ' of ' . $seats['total'] . ' in use'; +} + +/** Add keys to a license, one per line of $text - blank lines and keys it already has are skipped. Returns how many were added. */ +function softwareAddKeys($software_id, $text) { + global $mysqli; + $software_id = intval($software_id); + + $existing = []; + $sql = mysqli_query($mysqli, "SELECT software_key FROM software_keys WHERE software_key_software_id = $software_id"); + while ($row = mysqli_fetch_row($sql)) { + $existing[strtolower($row[0])] = true; + } + + $added = 0; + foreach (preg_split('/\r\n|\r|\n/', (string) $text) as $line) { + $key = mb_substr(trim($line), 0, 400); + if ($key === '' || isset($existing[strtolower($key)])) { + continue; + } + $existing[strtolower($key)] = true; + mysqli_query($mysqli, "INSERT INTO software_keys SET software_key = '" . escapeSql($key) . "', software_key_software_id = $software_id"); + $added++; + } + return $added; +} + +/** Who did what to a license - its audit log entries, newest first. */ +function softwareHistory($software_id, $limit = 50) { + global $mysqli; + $software_id = intval($software_id); + $limit = max(1, intval($limit)); + $sql = mysqli_query($mysqli, "SELECT log_action, log_description, log_created_at, user_name, user_avatar, user_id FROM logs + LEFT JOIN users ON user_id = log_user_id + WHERE log_type = 'Software' AND log_entity_id = $software_id + ORDER BY log_id DESC LIMIT $limit"); + $rows = []; + while ($row = mysqli_fetch_assoc($sql)) { + $rows[] = $row; + } + return $rows; +} + +/** Date from a form - Y-m-d or null. */ +function softwareFormDate($value) { + $value = trim((string) $value); + $date = DateTime::createFromFormat('!Y-m-d', $value); + return $date && $date->format('Y-m-d') === $value ? $value : null; +} + +/** + * The license fields a New / Edit form posts, as a SQL SET list - only the + * client's own vendor, real dates, a whole number of seats (blank is no + * limit). Null when there is no name. Fields missing from the post are blank, + * never a PHP warning. + */ +function softwareFormSet($post, $client_id) { + $text = function ($field, $length = 200) use ($post) { + $value = trim((string) ($post[$field] ?? '')); + return "'" . escapeSql($length ? mb_substr($value, 0, $length) : $value) . "'"; + }; + + $name = trim((string) ($post['name'] ?? '')); + if ($name === '') { + return null; + } + $seats = trim((string) ($post['seats'] ?? '')); + $purchase = softwareFormDate($post['purchase'] ?? ''); + $expire = softwareFormDate($post['expire'] ?? ''); + + $fields = [ + 'software_name' => $text('name'), + 'software_version' => $text('version'), + 'software_description' => $text('description', 0), + 'software_type' => $text('type'), + 'software_license_type' => $text('license_type'), + 'software_key' => $text('key'), + 'software_seats' => $seats === '' ? 'NULL' : max(0, intval($seats)), + 'software_purchase_reference' => $text('purchase_reference'), + 'software_purchase' => $purchase ? "'$purchase'" : 'NULL', + 'software_expire' => $expire ? "'$expire'" : 'NULL', + 'software_notes' => $text('notes', 0), + 'software_favorite' => empty($post['favorite']) ? 0 : 1, + 'software_vendor_id' => assetClientOwnedId('vendor', $post['vendor'] ?? 0, $client_id), + ]; + $set = []; + foreach ($fields as $column => $value) { + $set[] = "$column = $value"; + } + return implode(', ', $set); +} + +/** + * A renewal date moved on by a term ('1m', '3m', '6m', '1y', '2y', '3y') - + * from the current date, or from today if there is none or it has passed. + * Null for a term it does not know. + */ +function softwareRenewalExtended($expire, $term) { + $intervals = ['1m' => 'P1M', '3m' => 'P3M', '6m' => 'P6M', '1y' => 'P1Y', '2y' => 'P2Y', '3y' => 'P3Y']; + if (!isset($intervals[$term])) { + return null; + } + $today = new DateTime('today'); + $from = softwareFormDate(substr((string) $expire, 0, 10)); + $base = $from ? new DateTime($from) : $today; + if ($base < $today) { + $base = $today; + } + return $base->add(new DateInterval($intervals[$term]))->format('Y-m-d'); +} + +/** The renewal terms the Renew modal offers. */ +const SOFTWARE_RENEWAL_TERMS = ['1m' => '1 month', '3m' => '3 months', '6m' => '6 months', '1y' => '1 year', '2y' => '2 years', '3y' => '3 years'];