From 9ba21cf3527fd3cec712adc673dc9507739cc740 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 27 Oct 2026 15:59:03 -0400 Subject: [PATCH] Assets: add NAS, UPS, PDU, Modem/ONT and NVR/DVR types from a new registry in functions/asset_type.php that sets each type's icon, tone, group, fields and details; the asset form shows only the fields a type uses (fields that already hold a value stay shown) and adds a Details section per type (CPU/RAM/storage, VM host/vCPUs, switch ports/SFP/PoE/management, NAS drives/capacity/RAID, UPS capacity/output/runtime/outlets/battery dates, PDU kind/outlets/input, modem circuit ID/ISP account, printer, phone, mobile, display, camera and NVR details) stored in a new asset_specs table (database 3.4.9); new or changed port and SFP counts add the missing interfaces, continuing the asset's numbering, skipping Wi-Fi, VLAN and management ports and never deleting any; the asset page and quick look show the details, a server or NAS lists the VMs that run on it, and Assigned and Warranty show only on types that use them; the list gets Servers & NAS and Power tabs, an optional Details column, a UPS battery badge, an Assigned picker only on assigned types, and New buttons named for what they add; nightly UPS Battery Due notifications at 45, 7 and 1 days as a Support notification; copy leaves out per-unit details, Transfer to Client carries details and interface types, export adds per-detail columns, import reads detail columns after the standard twelve (VM hosts by name, resolved after every row is in) and reports values it could not keep, and the API reads and writes asset_specs; racks, client portal, client export, overview, document templates and AI lists group the new types; fix asset import carrying physical location and notes into the next row, saving 0000-00-00 for a missing purchase date and warning on an unknown contact or location, save API and import types in the list's spelling, and keep interface types on transfer; changelog updated --- CHANGELOG.md | 24 +- admin/database_updates/3.4.9.php | 28 + agent/asset.php | 61 +- agent/assets.php | 65 +- agent/modals/asset/asset.php | 18 +- agent/modals/asset/asset_add.php | 3 +- agent/modals/asset/asset_copy.php | 7 +- agent/modals/asset/asset_edit.php | 3 + agent/modals/asset/asset_export.php | 9 +- agent/modals/asset/asset_form.php | 238 +++++-- agent/modals/asset/asset_import.php | 1 + .../asset/asset_interface_multiple_add.php | 30 +- agent/modals/rack/rack_device_add.php | 4 +- agent/modals/rack/rack_device_form.php | 4 +- agent/post/asset.php | 110 +++- agent/rack.php | 4 +- api/v1/assets/asset_model.php | 2 +- api/v1/assets/create.php | 8 + api/v1/assets/read.php | 1 + api/v1/assets/update.php | 9 + api/v1/read_output.php | 5 + client/functions.php | 10 +- cron/nightly_tasks.php | 15 + css/itflow_custom.css | 9 + db.sql | 19 + functions.php | 1 + functions/ai_document.php | 4 +- functions/app.php | 33 +- functions/asset.php | 19 +- functions/asset_interface.php | 127 +++- functions/asset_type.php | 585 ++++++++++++++++++ functions/client_export.php | 10 +- functions/client_overview.php | 8 +- functions/document_template.php | 6 +- functions/export.php | 7 + functions/notifications.php | 3 +- functions/products.php | 5 +- functions/rack.php | 4 + includes/load_global_settings.php | 18 +- 39 files changed, 1277 insertions(+), 240 deletions(-) create mode 100644 admin/database_updates/3.4.9.php create mode 100644 functions/asset_type.php diff --git a/CHANGELOG.md b/CHANGELOG.md index d886bc3de..2949fdecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This file documents all notable changes made to ITFlow. ### Upgrading to 26.11 -Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.4.8) in the same pass. Nothing else is required. +Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.4.9) in the same pass. Nothing else is required. This is a big release, with nearly seventy database steps in one go, so take a backup before you update. @@ -75,6 +75,8 @@ The app logs are kept for as many days as the audit log, as before, and each can AI providers keep their address, key and models. Each is given a kind from where it points - OpenAI, Anthropic, Azure OpenAI, Google Gemini, Mistral, Groq, OpenRouter, Ollama or LM Studio - or Other (OpenAI-compatible), and passwords and keys are taken out of what is sent to each from now on, which can be turned off for a provider in its Edit window. Every role keeps using AI, through a new Use AI permission in Admin > Roles that can now be taken away from a role. A model's prompt is now its instructions, sent after what each feature asks for (see Breaking Changes, AI). AI Usage starts empty. AI triage of new tickets starts off - turn it on in Admin > Settings > Tickets. +Assets keep their type and everything they hold. NAS, UPS, PDU, Modem/ONT and NVR/DVR are new types to choose from, and no asset is changed to one by the update - a NAS or UPS entered before as a server or Other stays that until you change its type. No asset has details (ports, RAM, battery dates and the like) until you add them, and the update adds no interfaces (see New Features, Asset types and details). + If you are coming from 26.08 or earlier, the database update still has to be run from the command line one time, exactly as described under Upgrading to 26.09 below. ### Breaking Changes and Notes @@ -1208,6 +1210,17 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Each item shows as it will look: a tag as its pill, a category as its chip in its colour and icon, a product with its price and how it is billed - with what each is for. Categories are grouped by type, tags by what they tag and products by income category. - Preview, on ticket, project, document, vendor and license templates, canned responses and products, opens the whole of it in a window: a ticket template's subject, category, priority, tags, request form, what it says, what it asks for and its tasks; a canned response's reply type, ticket categories, status and what it says; a document template's review period, fill-ins and content; a vendor's support site, status page, portal and what support asks for; a license's type, renewal, vendor and product; a product's price, billing, code and category; a project template's tickets in order. The words filled in as each is used are marked. - On Maintenance > Starter Content, a pack's Add brings only what is ticked - and waits while nothing is - and Will be added says how many. Add all still adds every pack whole. +- **Asset types and details** (new) + - Five more types: NAS, UPS, PDU, Modem/ONT and NVR/DVR, each with its own icon and colour. The asset list's tabs follow them: NAS units sit with the servers in Servers & NAS, UPSs and PDUs in a new Power tab, modems with the network kit and NVRs under Other. + - Each type asks for what it has and nothing else. A virtual machine has no serial number, purchase or warranty, a mobile phone or tablet no network, and a display no OS. Kit that runs firmware - network gear, UPSs, printers, desk phones, cameras - calls the OS field Firmware, and only computers, phones, tablets and displays are assigned to someone. A field a type doesn't ask for still shows while it holds something, so nothing is lost when a type changes. The examples in each field follow the type picked. + - Details: the form has a Details section with what only that kind of thing has - CPU, RAM and storage for a laptop, desktop or server; host, vCPUs, RAM and storage for a virtual machine; ports, SFP ports, PoE budget and management for a switch; ports and SFP ports for a firewall; the Wi-Fi standard for an access point; drive bays, drives, raw and usable capacity, RAID and ports for a NAS; capacity (VA), output, runtime, outlets and when the battery went in and is to be replaced by for a UPS; kind, outlets and input for a PDU; circuit ID, ISP account and ports for a modem; channels, storage and ports for an NVR; colour and supplies for a printer; the extension for a desk phone; number, carrier and IMEI for a mobile phone or tablet; size and resolution for a display, and resolution for a camera. A value a detail can't take - a word for a number, a date that doesn't exist - is left out, and the message after saving says which and why. + - Ports: saving a switch with 24 ports and 4 SFP ports adds the interfaces it doesn't have yet - 02 to 24 after its primary 01, then SFP 1 to 4 - as Ethernet and SFP, carrying on from the ports already there. A new count adds the ones missing and a lower one takes none away; an edit that leaves the counts as they were adds nothing back. Wi-Fi, VLAN and other virtual interfaces don't count as ports, and neither does a management port such as mgmt0 or iDRAC. The form says how many the asset has now. + - The asset page's Hardware card lists the details, and the quick look the main ones. A server or NAS lists the virtual machines that run on it, and a VM links its host - one of the same client's servers or NAS units. + - UPS batteries: the replace-by date shows how long is left on the asset page, a badge in the asset list as it nears or passes, and agents are notified in ITFlow 45, 7 and 1 days before, as for warranties. + - The asset list has a Details column to show, with each asset's main details. Assigned To is offered only on assets that are assigned to someone, and New on each tab says what it adds - New Network Device, New UPS. + - Copy brings the details along, but not those of the one unit - IMEI, phone number, extension, circuit ID and ISP account. Transfer to Client takes the details and the interfaces' types to the new client, all but a VM's host. + - Export can add any detail as a column of its own, and its type filter has the list's tabs. Import reads details from columns after the usual twelve, headed as the export heads them (Ports, RAM (GB), Host and so on), keeps those the row's type has - a host by its name, even one further down the file - adds the ports they count, and says which values it couldn't keep. The API reads and writes them as `asset_specs`. + - Racks offer NAS units, UPSs, PDUs, NVRs and modems with the servers and network kit when racking an asset, and list them under Not racked yet - a NAS or UPS at 2U, a PDU or modem at half depth to start with. In the client portal's Your IT, UPSs and PDUs are under Power and NAS units with the servers, and the client export and overview group them the same way. ### Bug Fixes @@ -1421,6 +1434,9 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Assets: unlinking a contact from an asset with a page opened earlier took off whichever contact the asset had been given since. - Archiving, restoring or deleting an asset, contact, note, invoice, quote, payment or recurring invoice, or saving one, that someone else had just deleted showed an error page or warnings and wrote history for a record that was gone. It now says the record no longer exists. - Settings: the ticket prefix's letters-and-hyphens check didn't run in the browser - its pattern is refused by current browsers. ITFlow still checked it on saving. +- Assets: importing assets gave a row with no physical location or notes those of the row before it, saved rows without a purchase date with 0000-00-00 instead of none, and raised warnings for an Assigned To or Location that isn't one of the client's. A file with any column past the twelve was refused. +- Assets: a type sent through the API or an import in other capitals, such as server, was saved that way, so the asset didn't get its type's icon or fields. It is saved as the list spells it now. +- Assets: Transfer to Client dropped the type of every interface it copied, so SFP cages came across as untyped. ### Developer Updates @@ -2030,6 +2046,12 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Security sweep 2: new in `functions/export.php` - `exportClientName($client_id)` and `exportRecordName($table, $id, $name_column, $client_column)` (the name for an export's filter line only when the agent can reach its client; a record of no client is named) and `guardExportHasRows($num_rows, $what)` ("No $what match - nothing to export." and back, called before the `$num_rows > 0` block of every export but projects, services and the two logs, which already did). `download_assets_csv_template` needs `module_support` and names the file after the client only when `hasClientAccess()`. The flash messages of `delete_ticket_additional_asset`, `bulk_add_ticket_project` and `bulk_edit_asset_interface_network` name the asset, project or network only once it was on the ticket or taken; the unlink handlers in `agent/post/asset.php` and `contact.php` name the other record only when `assetClientOwnedId()` owns it; `bulk_move_files` refuses a folder whose client the agent can't reach before naming it. - Security sweep 2: the guest quote's Accept and Decline post `quote_id`, `url_key` and `accept_quote` or `decline_quote` to `guest/guest_post.php`, which compares the key with `hash_equals()`; the GET form of `accept_quote` / `decline_quote` no longer answers. `contractSignatureByKey()`, `portalInviteByLink()` and `client/join.php` take a key or token that isn't a string as ''. `$_SERVER['HTTP_USER_AGENT'] ?? ''` in `api/v1/validate_api_key.php`, `includes/load_user_session.php`, `client/login_microsoft.php`, `guest/includes/inc_all_guest.php` and `isMobile()`. - Security sweep 2: the handlers that fetch their record and go on when it is gone return "That ... no longer exists." - `archive_asset`, `restore_asset` (both failed on `asset_history`'s foreign key), `delete_asset`, `edit_asset`, the asset and contact note handlers, `add_asset_note`, `add_contact_note`, `anonymize_contact`, `archive_contact`, `restore_contact`, `delete_contact`, `unlink_credential_from_contact`, `unlink_credential_from_asset`, `edit_invoice`, `add_invoice_copy`, `mark_invoice_sent`, `mark_invoice_non-billable`, `cancel_invoice`, `delete_invoice`, `delete_payment`, `refund_payment_stripe`, `add_quote_copy`, `edit_quote`, `mark_quote_sent`, `delete_quote`, `accept_quote`, `decline_quote`, `mark_quote_invoiced`, `add_invoice_recurring`, `edit_recurring_invoice`, `set_recurring_payment`, `delete_recurring_invoice` and `recurring_invoice_email_notify`. `restore_contact_note` read its id from `unarchive_contact_note`. The ticket prefix's `pattern` is `[A-Za-z\-]+` - an unescaped `-` in a class is an error under the `v` flag browsers now compile `pattern` with. +- Asset types: new `functions/asset_type.php`, loaded by `functions.php`. `ASSET_TYPES` (name => `icon`, `tone`, `group`, `os` - `os` or `firmware` - `fields` from `ASSET_FIELDS` (`contact`, `os`, `network`, `nat`, `links`, `serial`, `purchase`, `warranty`), `specs` and `example`, the form's placeholders), `ASSET_SPECS` (key => `label`, `input` - text, number, select, date or asset - `icon`, and as they apply `unit`, `min`, `max`, `step`, `options`, `suggest`, `asset_types`, `placeholder`, `ports` (`copper` or `sfp`), `flag`, `mono`, `unit_only` and `alone` - a value that says what it is, shown without its label in a short line), `ASSET_RACK_TYPES` and `ASSET_TYPE_GROUPS`. `assetTypeInfo()` (case-blind, Other's entry for a type it doesn't know), `assetTypeName()`, `assetTypeIcons()` (what `$asset_types_array` and `productAssetTypes()` return now), `assetTypesInGroup(...$groups)`, `assetTypeGroupSql($group, $column)`, `assetTypeTabs($column)` (`workstation`, `server`, `virtual`, `network`, `power`, `printer` and `other`, each with `label`, `new`, `groups`, `icon` and `query` - the list's and the export's `type`), `assetTypeHasField()`, `assetTypeOsLabel()` and `assetTypeSpecs()`. `assetTypeTone()`, `getAssetIcon()`, `rackItemStyle()`, `portalAssetGroups()` (with `power`), the client overview's counts, the client export's families and the document template and AI asset lists read the registry. +- Asset details: database 3.4.9 adds `asset_specs` - `asset_spec_asset_id` (ON DELETE CASCADE), `asset_spec_key` varchar(50) and `asset_spec_value` varchar(255), unique on the asset and key, keyed on the key and value. `assetSpecsReady()` (false until the update has run: nothing is read, kept or flagged), `assetSpecsFor($asset_ids)`, `assetSpecs($asset_id)`, `assetSpecsFromInput($type, $input, $client_id, $asset_id, &$problems)` (each checked by its input; an asset pick by id or name, the same client's, of its `asset_types`, not itself), `assetSpecsSave($asset_id, $type, $specs)` (keys not given or not the type's are deleted), `assetSpecsFromPost($asset_id, $type, $input, $client_id)` (returns the message's ", with ... added" and the problems; ports are made when a count is new or changed), `assetPortsFromSpecs()`, `assetPortsMadeText()`, `assetSpecText()`, `assetSpecRows($type, $specs, $client_id)` (key => `label`, `icon`, `text`, `html`, `flag` from `assetWarranty()`, `alone` and `brief` - the short line the list and the quick look use), `assetSpecAssetOptions()`, `assetGuests($asset_id, $client_id)`, `assetSpecsExportAttach($rows)` (`spec_`, a host by name) and `assetSpecsApiAttach($rows)`. +- Asset handlers: `add_asset` and `edit_asset` take `spec[key]`; `edit_asset` without `spec` keeps the asset's details, less those its type doesn't take. `import_assets_csv` takes twelve columns or more, matching each after the twelfth to a detail by its label, label and unit, or key, and keeps them once every row is in. `bulk_transfer_client_asset` copies `interface_type` and the details but `vm_host`. `export_assets` takes `spec_` in `columns[]` and the `assetTypeTabs()` keys in `type`. `agent/assets.php` takes `type=power` and `show_column[]=Details`. +- Interfaces: `INTERFACE_SFP_TYPES`, `INTERFACE_NOT_PORT_PATTERN`, `INTERFACE_MANAGEMENT_PATTERN`, `interfaceIsSfp()`, `interfacePortKind($type, $name)` (`copper`, `sfp`, or '' for a radio, VLAN, coax or console, or a management port such as mgmt0), `interfaceSeriesNext($asset_id, $asset_type, $sfp)` ([prefix, start, pad] of the next run, which New interfaces now starts from) and `interfacePortsEnsure($asset_id, $asset_type, $copper, $sfp)` (makes the missing ones, counting live ports, never taking an archived one's name). `INTERFACE_PORT_MAP_TYPES` adds Modem/ONT, NAS and NVR/DVR. +- API: `assets/create` and `assets/update` take `asset_specs` ({key: value}; on update laid over what the asset has, '' clearing one, and a new `asset_type` keeping only its own) and answer `asset_specs_not_kept` (an array of strings) when some weren't kept; `asset_type` is saved as the list spells it. `assets/read` gives every asset `asset_specs` ({} for none), through `$api_asset_specs` in `api/v1/read_output.php`. +- Nightly: "UPS Battery Due" notifications from a UPS's `battery_replace`, on the warranty alert days (1, 7, 45), linking to the asset - a Support type in `notificationTypeModules()`, drawn with `car-battery`. CSS: `.itflow-asset-tone-storage` and `.itflow-asset-tone-power`, light and dark, and `.itflow-port-break` before a port map's SFP cages. ### Library Updates diff --git a/admin/database_updates/3.4.9.php b/admin/database_updates/3.4.9.php new file mode 100644 index 000000000..4c6b39a53 --- /dev/null +++ b/admin/database_updates/3.4.9.php @@ -0,0 +1,28 @@ += 1; $asset_invoice_id = intval($row['asset_invoice_id']); @@ -425,17 +432,38 @@ if (mysqli_num_rows($sql) == 0) {
-
OS
+
+ + $spec_row) { ?> +
+
+ + +
+ + + +
+ + +
Runs
+
+ $guest_name) { ?> +
+ +
+ + +
Warranty
+
+ + +
+ + Not recorded + +
-
Warranty
-
- - -
- - Not recorded - -
Purchased
old
@@ -489,6 +517,7 @@ if (mysqli_num_rows($sql) == 0) {
Rack
+
Assigned
@@ -501,6 +530,7 @@ if (mysqli_num_rows($sql) == 0) {
+ @@ -604,7 +634,16 @@ if (mysqli_num_rows($sql) == 0) {
- $row) { + interfaceIsSfp($b['interface_type']); + }); + foreach ($interfaces as $interface_id => $row) { + if (!$port_map_sfp && interfaceIsSfp($row['interface_type'])) { + $port_map_sfp = true; + echo ''; + } $link = $interface_links[$interface_id] ?? null; $states = array_filter([$link ? 'is-connected' : '', trim((string) $row['interface_ip']) !== '' ? 'is-addressed' : '', intval($row['interface_primary']) ? 'is-primary' : '']); $tip = implode("\n", array_filter([ diff --git a/agent/assets.php b/agent/assets.php index 7fdfaafd7..868f03ed1 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -45,15 +45,8 @@ enforceUserPermission('module_support'); $can_edit = lookupUserPermission('module_support') >= 2; $can_delete = lookupUserPermission('module_support') >= 3; -//Asset Type from GET -$asset_type_tabs = [ - 'workstation' => ['label' => 'Workstations', 'icon' => 'fa-desktop', 'query' => "asset_type IN ('Desktop', 'Laptop')"], - 'server' => ['label' => 'Servers', 'icon' => 'fa-server', 'query' => "asset_type = 'Server'"], - 'virtual' => ['label' => 'Virtual', 'icon' => 'fa-cloud', 'query' => "asset_type = 'Virtual Machine'"], - 'network' => ['label' => 'Network', 'icon' => 'fa-network-wired', 'query' => "asset_type IN ('Firewall/Router', 'Switch', 'Access Point')"], - 'printer' => ['label' => 'Printers', 'icon' => 'fa-print', 'query' => "asset_type = 'Printer'"], - 'other' => ['label' => 'Other', 'icon' => 'fa-tag', 'query' => "asset_type NOT IN ('Desktop', 'Laptop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point', 'Printer')"], -]; +// Asset type tabs (functions/asset_type.php) +$asset_type_tabs = assetTypeTabs(); $type_filter = (isset($_GET['type']) && isset($asset_type_tabs[$_GET['type']])) ? $_GET['type'] : ''; $_GET['type'] = $type_filter; $type_query = $type_filter ? $asset_type_tabs[$type_filter]['query'] : "1 = 1"; @@ -111,15 +104,17 @@ $extra_column_options = [ 'Purchase_Date' => 'Purchase date', 'Install_Date' => 'Install date', 'Warranty_Expire' => 'Warranty', + 'Details' => 'Details', ]; $extra_columns = array_values(array_intersect(array_keys($extra_column_options), (array) ($_GET['show_column'] ?? []))); $show_mac = in_array('Mac_Address', $extra_columns, true); $show_purchase = in_array('Purchase_Date', $extra_columns, true); $show_install = in_array('Install_Date', $extra_columns, true); $show_warranty = in_array('Warranty_Expire', $extra_columns, true); +$show_details = in_array('Details', $extra_columns, true); // Assigned To only means something for workstations and the like - printers are shared -$show_contact = !in_array($type_filter, ['network', 'server', 'printer', 'other'], true); +$show_contact = !in_array($type_filter, ['network', 'server', 'virtual', 'power', 'printer', 'other'], true); $show_model = $type_filter !== 'virtual'; // Only these sort - filter_header.php will hand through any lowercase word, and @@ -138,13 +133,9 @@ $order_by = $sort === 'interface_ip' ? "INET6_ATON(interface_ip) $order, interfa // Tab counts - within the client, status, tag and archive scope, before the search narrows it $row = mysqli_fetch_assoc(mysqli_query($mysqli, " SELECT - COUNT(*) AS all_count, - SUM(asset_type IN ('Laptop', 'Desktop')) AS workstation_count, - SUM(asset_type = 'Server') AS server_count, - SUM(asset_type = 'Virtual Machine') AS virtual_count, - SUM(asset_type IN ('Firewall/Router', 'Switch', 'Access Point')) AS network_count, - SUM(asset_type = 'Printer') AS printer_count, - SUM(asset_type NOT IN ('Laptop', 'Desktop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point', 'Printer')) AS other_count + COUNT(*) AS all_count" . implode('', array_map(function ($tab_key, $tab) { + return ",\n SUM({$tab['query']}) AS {$tab_key}_count"; + }, array_keys($asset_type_tabs), $asset_type_tabs)) . " FROM assets LEFT JOIN clients ON client_id = asset_client_id WHERE $archive_query @@ -153,15 +144,10 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " " . clientScopeSql('asset_client_id') . " $client_query ")); -$tab_counts = [ - '' => intval($row['all_count']), - 'workstation' => intval($row['workstation_count']), - 'server' => intval($row['server_count']), - 'virtual' => intval($row['virtual_count']), - 'network' => intval($row['network_count']), - 'printer' => intval($row['printer_count']), - 'other' => intval($row['other_count']), -]; +$tab_counts = ['' => intval($row['all_count'])]; +foreach ($asset_type_tabs as $tab_key => $tab) { + $tab_counts[$tab_key] = intval($row[$tab_key . '_count']); +} $sql = mysqli_query( $mysqli, @@ -195,6 +181,8 @@ $assets = []; while ($row = mysqli_fetch_assoc($sql)) { $assets[intval($row['asset_id'])] = $row; } +// Each one's details - its type's (functions/asset_type.php): a UPS battery due is flagged like a warranty, and Details lists them +$asset_list_specs = assetSpecsFor(array_keys($assets)); // Tags and rack positions for the whole page in two queries, not two per row $assets_tags = tagsForRecords('asset', array_keys($assets)); @@ -219,7 +207,7 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets'
@@ -502,6 +490,9 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' + + Details + @@ -571,6 +562,8 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' $asset_contact_id = intval($row['asset_contact_id']); $asset_tone = assetTypeTone($row['asset_type']); $device_icon = getAssetIcon($row['asset_type']); + $asset_spec_rows = assetSpecRows($row['asset_type'], $asset_list_specs[$asset_id] ?? [], $client_id); + $asset_battery = $asset_spec_rows['battery_replace']['flag'] ?? null; $contact_name = escapeHtml($row['contact_name']); $contact_archived = !empty($row['contact_archived_at']); @@ -627,6 +620,11 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' Warranty + + + Battery + + @@ -664,6 +662,17 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets'
old
+ + + + +
' . escapeHtml($spec_row['label']) . ' ' . escapeHtml($spec_row['flag']['date']) . '' : $spec_row['brief'] ?>
+ + + - + + + -' ?> @@ -679,7 +688,7 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' - + $contact_archived]) ?> diff --git a/agent/modals/asset/asset.php b/agent/modals/asset/asset.php index 00b4d2652..b8168d5e7 100644 --- a/agent/modals/asset/asset.php +++ b/agent/modals/asset/asset.php @@ -158,7 +158,11 @@ $quick_tabs = array_filter([ }); $first_tab = array_key_first($quick_tabs); -$has_left = $asset_ip || $asset_mac || $asset_serial || $asset_warranty; +// Its type's details (functions/asset_type.php) - and Assigned only on a type someone is given, or one that has someone +$asset_spec_rows = assetSpecRows($asset_row['asset_type'], assetSpecs($asset_id), $client_id); +$asset_has_contact = assetTypeHasField($asset_row['asset_type'], 'contact') || $asset_row['contact_name']; + +$has_left = $asset_ip || $asset_mac || $asset_serial || $asset_warranty || $asset_spec_rows; $has_right = $can_edit || $asset_row['location_name'] || $asset_row['contact_name'] || $asset_rack; ob_start(); @@ -245,6 +249,16 @@ ob_start(); Warranty
+ $spec_row) { ?> +
+ + + - + + + +
+
@@ -262,7 +276,7 @@ ob_start();
- +
diff --git a/agent/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php index 7cace027e..d7364020c 100644 --- a/agent/modals/asset/asset_add.php +++ b/agent/modals/asset/asset_add.php @@ -10,7 +10,7 @@ if ($client_id) { } // The assets list passes the tab it was on - start on that kind of asset -$type_presets = ['workstation' => 'Desktop', 'server' => 'Server', 'virtual' => 'Virtual Machine', 'network' => 'Switch', 'printer' => 'Printer']; +$type_presets = ['workstation' => 'Desktop', 'server' => 'Server', 'virtual' => 'Virtual Machine', 'network' => 'Switch', 'power' => 'UPS', 'printer' => 'Printer']; $type_param = strtolower((string) ($_GET['type'] ?? '')); $asset_form_mode = 'add'; @@ -28,6 +28,7 @@ $asset_vendor_id = $client_id ? assetClientOwnedId('vendor', $_GET['vendor_id'] $asset_location_id = $client_id ? assetClientOwnedId('location', $_GET['location_id'] ?? 0, $client_id) : 0; $asset_contact_id = intval($_GET['contact_id'] ?? 0); $asset_tag_id_array = []; +$asset_specs = []; ob_start(); diff --git a/agent/modals/asset/asset_copy.php b/agent/modals/asset/asset_copy.php index 08fc45513..d24bf2579 100644 --- a/agent/modals/asset/asset_copy.php +++ b/agent/modals/asset/asset_copy.php @@ -53,6 +53,11 @@ $asset_favorite = 0; $device_icon = getAssetIcon($row['asset_type']); +// Its details come along, bar the ones that belong to that one unit - an IMEI, a circuit +$asset_specs = array_filter(assetSpecs($source_asset_id), function ($key) { + return empty(ASSET_SPECS[$key]['unit_only']); +}, ARRAY_FILTER_USE_KEY); + // Tags come along $asset_tag_id_array = array(); $sql_asset_tags = mysqli_query($mysqli, "SELECT asset_tag_tag_id FROM asset_tags WHERE asset_tag_asset_id = $source_asset_id"); @@ -73,7 +78,7 @@ ob_start();
-
Serial, addresses, links and photo start empty - they belong to the unit you're copying.
+
Serial, addresses, links, photo and details like an IMEI start empty - they belong to the unit you're copying.
diff --git a/agent/modals/asset/asset_edit.php b/agent/modals/asset/asset_edit.php index 2bf067c01..fcf2035d7 100644 --- a/agent/modals/asset/asset_edit.php +++ b/agent/modals/asset/asset_edit.php @@ -56,6 +56,9 @@ $asset_network_id = intval($row['interface_network_id']); $device_icon = getAssetIcon($row['asset_type']); +// Its details - its type's are shown (functions/asset_type.php) +$asset_specs = assetSpecs($asset_id); + // History, newest first $sql_asset_history = mysqli_query($mysqli, "SELECT asset_history_created_at, asset_history_description, asset_history_status FROM asset_history WHERE asset_history_asset_id = $asset_id diff --git a/agent/modals/asset/asset_export.php b/agent/modals/asset/asset_export.php index 97412f068..f791b0ca1 100644 --- a/agent/modals/asset/asset_export.php +++ b/agent/modals/asset/asset_export.php @@ -68,12 +68,9 @@ ob_start();
diff --git a/agent/modals/asset/asset_form.php b/agent/modals/asset/asset_form.php index 18c1cb2f4..6888aaa85 100644 --- a/agent/modals/asset/asset_form.php +++ b/agent/modals/asset/asset_form.php @@ -11,7 +11,11 @@ * Notes. Every field is always in the form, whatever the asset type: fields * that came and went with the type used to drop out of the POST entirely, * and the handler then saved them as empty - editing an access point wiped - * its firmware version. + * its firmware version. So a field its type doesn't have (ASSET_TYPES in + * functions/asset_type.php) is only hidden, and one with a value is shown + * all the same; a tab left with nothing in it goes too. Details - the type's + * own, from ASSET_SPECS - are under Hardware, as spec[key]; the caller sets + * $asset_specs (raw) for an asset that has them. * * Should not be accessed directly. */ @@ -68,6 +72,31 @@ while ($row = mysqli_fetch_assoc($sql)) { $asset_ip_is_dhcp = $asset_ip === 'DHCP'; +// The type's details (functions/asset_type.php) - every one is in the form, its type's shown +$asset_specs = $asset_specs ?? []; +$asset_type_raw = html_entity_decode($asset_type, ENT_QUOTES, 'UTF-8'); +$asset_type_known = assetTypeName($asset_type_raw); +// What each type shows, for the script - fields, what the OS field is called, details +$asset_form_types = []; +foreach (ASSET_TYPES as $asset_form_type => $asset_form_info) { + $asset_form_types[$asset_form_type] = ['fields' => $asset_form_info['fields'], 'os' => assetTypeOsLabel($asset_form_type), 'specs' => $asset_form_info['specs'], 'example' => $asset_form_info['example']]; +} +// Ports it has now, for the counts' hints - copper and SFP cages +$asset_port_counts = ['copper' => 0, 'sfp' => 0]; +if ($asset_form_mode === 'edit' && $asset_id) { + $sql = mysqli_query($mysqli, "SELECT interface_name, interface_type, interface_primary FROM asset_interfaces WHERE interface_asset_id = " . intval($asset_id) . " AND interface_archived_at IS NULL"); + while ($row = mysqli_fetch_assoc($sql)) { + $port_kind = interfacePortKind($row['interface_type'], $row['interface_name']); + if ($port_kind !== '') { + $asset_port_counts[$port_kind]++; + if ($row['interface_primary']) { + $asset_port_counts['primary'] = $port_kind; + } + } + } +} +$asset_host_options = $client_id ? assetSpecAssetOptions('vm_host', $client_id, $asset_id ?? 0, intval($asset_specs['vm_host'] ?? 0)) : []; + // Leading icons that follow what is picked or typed: the status in its // colour, the OS brand and the kind of link - the same as the assets list // shows them (functions/asset.php). Type needs none, its picker already shows @@ -138,7 +167,10 @@ $asset_form_icons = [
@@ -200,15 +232,15 @@ $asset_form_icons = [ -
+
-
- +
+
@@ -216,6 +248,75 @@ $asset_form_icons = [
+ +
Details
+
+ $spec) { + $spec_value = (string) ($asset_specs[$spec_key] ?? ''); + $spec_id = 'assetFormSpec_' . $spec_key; + $spec_shown = in_array($spec_key, assetTypeInfo($asset_type_raw)['specs'], true); ?> +
> + +
+ + + + + + + + + + + min="" max="" step="" inputmode="decimal" + max="2999-12-31" + maxlength="255" + + > + + + + +
+ + + + + + + + +
+ + Has now. A new count adds the ones missing to its interfaces - none are taken away. + + Added to its interfaces when it's saved. + +
+ +
Flagged on its page as the date nears, like a warranty.
+ +
+ +
+

Asset ID

@@ -245,7 +346,7 @@ $asset_form_icons = [
-
+
@@ -278,7 +379,7 @@ $asset_form_icons = [

The primary interface. Add more ports from the asset's Interfaces tab.

-
+
@@ -292,7 +393,7 @@ $asset_form_icons = [
-
+
@@ -305,21 +406,21 @@ $asset_form_icons = [
-
+
-
+
-
+
@@ -328,29 +429,31 @@ $asset_form_icons = [
-
Links
-
-
- -
- - +
+
Links
+
+
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
+
Shown to the client in their portal.
-
Shown to the client in their portal.
@@ -359,7 +462,7 @@ $asset_form_icons = [
-
+
@@ -373,14 +476,14 @@ $asset_form_icons = [
-
+
-
+
@@ -394,7 +497,7 @@ $asset_form_icons = [
-
+
@@ -546,6 +649,71 @@ $asset_form_icons = [ }); }); + // What the type shows: its fields - and any other with something in it, + // so nothing is hidden with a value - its details, and a tab only while + // something on it is showing. Hidden fields are still sent as they are. + var types = ; + var typeSelect = form.querySelector('[name="type"]'); + var osLabel = form.querySelector('[data-asset-os-label]'); + function hasValue(box) { + return Array.prototype.some.call(box.querySelectorAll('input, select, textarea'), function (field) { + if (field.type === 'checkbox') { + return field.checked && field.name === 'dhcp'; + } + return field.type !== 'hidden' && field.value.trim() !== ''; + }); + } + function applyType() { + var type = types[typeSelect.value] || types.Other; + form.querySelectorAll('[data-asset-field]').forEach(function (box) { + box.hidden = type.fields.indexOf(box.dataset.assetField) === -1 && !hasValue(box); + }); + var anySpec = false; + form.querySelectorAll('[data-asset-spec]').forEach(function (box) { + box.hidden = type.specs.indexOf(box.dataset.assetSpec) === -1; + anySpec = anySpec || !box.hidden; + }); + var heading = form.querySelector('[data-asset-specs-heading]'); + heading.hidden = !anySpec; + heading.textContent = (types[typeSelect.value] ? typeSelect.value + ' ' : '') + 'details'; + if (osLabel) { + osLabel.textContent = typeSelect.value ? type.os : 'Operating system / firmware'; + } + // Its details in its own order, and suggestions that fit it + type.specs.forEach(function (key, at) { + var box = form.querySelector('[data-asset-spec="' + key + '"]'); + if (box) { + box.style.order = at; + } + }); + if (types[typeSelect.value]) { + ['name', 'description', 'make', 'model', 'os'].forEach(function (field) { + var input = form.querySelector('[name="' + field + '"]'); + if (input && type.example[field] !== undefined) { + input.placeholder = type.example[field]; + } + }); + } + // A tab with nothing left on it goes - back to Details if it was open + form.querySelectorAll('.itflow-asset-form-tabs [data-bs-toggle="pill"]').forEach(function (tab) { + var pane = form.querySelector(tab.getAttribute('href')); + var fields = pane ? pane.querySelectorAll('[data-asset-field]') : []; + var always = pane && Array.prototype.some.call(pane.querySelectorAll('.form-label'), function (label) { + return !label.closest('[data-asset-field]'); + }); + if (!fields.length) { + return; + } + var empty = Array.prototype.every.call(fields, function (box) { return box.hidden; }); + tab.closest('.nav-item').hidden = empty && !always; + if (empty && !always && tab.classList.contains('active')) { + bootstrap.Tab.getOrCreateInstance(form.querySelector('[href="#assetFormDetails"]')).show(); + } + }); + } + typeSelect.addEventListener('change', applyType); + applyType(); + // DHCP means no fixed address to type var dhcp = form.querySelector('#assetFormDhcp'); var ip = form.querySelector('#assetFormIp'); diff --git a/agent/modals/asset/asset_import.php b/agent/modals/asset/asset_import.php index 643695478..a5f2752bd 100644 --- a/agent/modals/asset/asset_import.php +++ b/agent/modals/asset/asset_import.php @@ -18,6 +18,7 @@ ob_start();

Format csv file with headings & data:
Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes

+

After those, any of an asset's details can follow, headed as the asset export heads them - Ports, SFP Ports, RAM (GB), Capacity (VA) and so on. Each is kept where the row's type has it, and Ports and SFP Ports add its interfaces.

diff --git a/agent/modals/asset/asset_interface_multiple_add.php b/agent/modals/asset/asset_interface_multiple_add.php index c056cb429..4160faadf 100644 --- a/agent/modals/asset/asset_interface_multiple_add.php +++ b/agent/modals/asset/asset_interface_multiple_add.php @@ -15,39 +15,13 @@ $client_id = intval($asset['asset_client_id']); $networks = interfaceNetworkOptions($client_id); $types = interfaceTypes(); -// A start that follows on from ports already there - Gi1/0/1 to 24 there, start at 25 +// A start that follows on from ports already there - Gi1/0/1 to 24 there, start at 25 (functions/asset_interface.php) $existing = []; $sql = mysqli_query($mysqli, "SELECT interface_name FROM asset_interfaces WHERE interface_asset_id = $asset_id AND interface_archived_at IS NULL"); while ($row = mysqli_fetch_row($sql)) { $existing[] = $row[0]; } -// the numbered run there is most of (Gi1/0/1-24, not mgmt0), carrying on its zero-padding -$prefix = ''; -$start = 1; -$pad = 0; -$runs = []; -foreach ($existing as $name) { - if (preg_match('/^(.*?)(\d+)$/', $name, $match)) { - $runs[$match[1]][] = $match[2]; - } -} -if ($runs) { - uasort($runs, function ($a, $b) { - return count($b) <=> count($a); - }); - $prefix = (string) array_key_first($runs); - $numbers = $runs[$prefix]; - $start = max(array_map('intval', $numbers)) + 1; - foreach ($numbers as $number) { - if (strlen($number) > 1 && $number[0] === '0') { - $pad = strlen($number); - } - } -} -if (!$existing) { - $prefix = in_array($asset['asset_type'], ['Switch'], true) ? 'Gi1/0/' : (in_array($asset['asset_type'], ['Firewall/Router', 'Access Point'], true) ? 'Port ' : 'eth'); - $start = $prefix === 'eth' ? 0 : 1; -} +[$prefix, $start, $pad] = interfaceSeriesNext($asset_id, $asset['asset_type']); $count = $asset['asset_type'] === 'Switch' ? 24 : 4; ob_start(); diff --git a/agent/modals/rack/rack_device_add.php b/agent/modals/rack/rack_device_add.php index 7922c87c2..b05edb1b2 100644 --- a/agent/modals/rack/rack_device_add.php +++ b/agent/modals/rack/rack_device_add.php @@ -35,8 +35,8 @@ $unit_notes = ''; $unit_asset_id = intval($_GET['asset_id'] ?? 0); if ($unit_asset_id) { $preset_asset_type = getFieldById('assets', $unit_asset_id, 'asset_type'); - $unit_height = $preset_asset_type === 'Server' ? 2 : 1; - $unit_full_depth = in_array($preset_asset_type, ['Access Point', 'Firewall/Router'], true) ? 0 : 1; + $unit_height = in_array($preset_asset_type, ['Server', 'NAS', 'UPS'], true) ? 2 : 1; + $unit_full_depth = in_array($preset_asset_type, ['Access Point', 'Firewall/Router', 'Modem/ONT', 'PDU'], true) ? 0 : 1; } ob_start(); diff --git a/agent/modals/rack/rack_device_form.php b/agent/modals/rack/rack_device_form.php index 82ab23e1e..86c22d994 100644 --- a/agent/modals/rack/rack_device_form.php +++ b/agent/modals/rack/rack_device_form.php @@ -38,7 +38,7 @@ $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type, asset_mak asset_archived_at IS NULL AND NOT EXISTS (SELECT 1 FROM rack_units WHERE unit_asset_id = asset_id) )) - ORDER BY FIELD(asset_type, 'Server', 'Switch', 'Firewall/Router', 'Access Point') = 0, asset_type, asset_name"); + ORDER BY FIELD(asset_type, '" . implode("', '", array_map('escapeSql', ASSET_RACK_TYPES)) . "') = 0, asset_type, asset_name"); while ($row = mysqli_fetch_assoc($sql)) { $asset_options[] = $row; } @@ -166,7 +166,7 @@ $item_types = rackItemTypes(); // Things that sit at the front and leave the back free, as a starting point var halfDepthTypes = ['Patch Panel', 'Cable Management', 'Blanking Panel']; - var halfDepthAssetTypes = ['Access Point', 'Firewall/Router']; + var halfDepthAssetTypes = ['Access Point', 'Firewall/Router', 'Modem/ONT', 'PDU']; function kind() { return form.querySelector('input[name="item_kind"]:checked').value; diff --git a/agent/post/asset.php b/agent/post/asset.php index 8d4f5a1f6..f4c99d862 100644 --- a/agent/post/asset.php +++ b/agent/post/asset.php @@ -67,6 +67,10 @@ if (isset($_POST['add_asset'])) { // Add Primary Interface mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '01', interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_primary = 1, interface_network_id = $network, interface_asset_id = $asset_id"); + // Its type's details, and the ports they count (functions/asset_type.php) + [$spec_note, $spec_problems] = assetSpecsFromPost($asset_id, $_POST['type'] ?? '', $_POST['spec'] ?? [], $client_id); + $alert_extended .= $spec_note; + // A username or a password on its own is enough to keep if (trim((string) ($_POST['username'] ?? '')) !== '' || trim((string) ($_POST['password'] ?? '')) !== '') { $username = encryptCredentialEntry(trim((string) ($_POST['username'] ?? ''))); @@ -95,7 +99,7 @@ if (isset($_POST['add_asset'])) { logAudit("Asset", "Create", "$session_name created asset $name", $client_id, $asset_id); - flashAlert("Asset " . stripslashes($name) . " created$alert_extended"); + flashAlert("Asset " . stripslashes($name) . " created$alert_extended" . ($spec_problems ? ' - not kept: ' . escapeHtml(implode('; ', $spec_problems)) : ''), $spec_problems ? 'warning' : 'success'); redirect(); @@ -141,6 +145,9 @@ if (isset($_POST['edit_asset'])) { mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_mac = '$mac', interface_ip = '$ip', interface_nat_ip = '$nat_ip', interface_ipv6 = '$ipv6', interface_network_id = $network WHERE interface_asset_id = $asset_id AND interface_primary = 1"); } + // Its type's details, and the ports they count (functions/asset_type.php) - a post without them keeps what it has, less what its type doesn't take + [$spec_note, $spec_problems] = assetSpecsFromPost($asset_id, $_POST['type'] ?? '', $_POST['spec'] ?? assetSpecs($asset_id), $client_id); + // Photo - a new upload replaces the old file; Remove only counts when nothing new came in $existing_photo_path = $existing_file_name !== '' ? "../uploads/clients/$client_id/" . basename($existing_file_name) : ''; if (isset($_FILES['file']) && $new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) { @@ -170,7 +177,7 @@ if (isset($_POST['edit_asset'])) { logAudit("Asset", "Edit", "$session_name edited asset $name", $client_id, $asset_id); - flashAlert("Asset " . stripslashes($name) . " saved"); + flashAlert("Asset " . stripslashes($name) . " saved$spec_note" . ($spec_problems ? ' - not kept: ' . escapeHtml(implode('; ', $spec_problems)) : ''), $spec_problems ? 'warning' : 'success'); redirect(); @@ -552,18 +559,25 @@ if (isset($_POST['bulk_transfer_client_asset'])) { "); $new_asset_id = mysqli_insert_id($mysqli); - // Transfer all Interfaces over too - $sql_interfaces = mysqli_query($mysqli, "SELECT interface_mac, interface_name, interface_primary FROM asset_interfaces WHERE interface_asset_id = $current_asset_id"); + // Transfer all Interfaces over too - with their type, so a port stays a port and an SFP cage a cage + $sql_interfaces = mysqli_query($mysqli, "SELECT interface_mac, interface_name, interface_type, interface_primary FROM asset_interfaces WHERE interface_asset_id = $current_asset_id"); while ($row = mysqli_fetch_assoc($sql_interfaces)) { $interface_name = escapeSql($row['interface_name']); $interface_mac = escapeSql($row['interface_mac']); + $interface_type = $row['interface_type'] === null ? 'NULL' : "'" . escapeSql($row['interface_type']) . "'"; $interface_primary = intval($row['interface_primary']); - mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$interface_name', interface_mac = '$interface_mac', interface_primary = $interface_primary, interface_asset_id = $new_asset_id"); + mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$interface_name', interface_mac = '$interface_mac', interface_type = $interface_type, interface_primary = $interface_primary, interface_asset_id = $new_asset_id"); } + // And its details (functions/asset_type.php) - all but a VM's host, which is the old client's + if (assetSpecsReady()) { + mysqli_query($mysqli, "INSERT INTO asset_specs (asset_spec_asset_id, asset_spec_key, asset_spec_value) + SELECT $new_asset_id, asset_spec_key, asset_spec_value FROM asset_specs WHERE asset_spec_asset_id = $current_asset_id AND asset_spec_key != 'vm_host'"); + } + mysqli_query($mysqli, "UPDATE assets SET asset_client_id = $new_client_id WHERE asset_id = $new_asset_id"); // Archive/log the current asset @@ -1013,13 +1027,25 @@ if (isset($_POST["import_assets_csv"])) { flashAlert("Bad file size (empty?)", 'error'); } - //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location, notes) + //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location, physical location, notes), + // then any of the details, headed as the export heads them (functions/asset_type.php) $f = fopen($file_name, "r"); $f_columns = fgetcsv($f, 1000, ","); - if (!$error & count($f_columns) != 12) { + if (!$error & (!is_array($f_columns) || count($f_columns) < 12)) { $error = true; flashAlert("Invalid column count.", 'error'); } + $spec_columns = []; + if (!$error) { + foreach (array_slice($f_columns, 12, null, true) as $index => $heading) { + $heading = strtolower(trim((string) $heading)); + foreach (ASSET_SPECS as $spec_key => $spec) { + if ($heading === strtolower($spec['label']) || $heading === strtolower($spec['label'] . (isset($spec['unit']) ? ' (' . $spec['unit'] . ')' : '')) || $heading === $spec_key) { + $spec_columns[$index] = $spec_key; + } + } + } + } //Else, parse the file if (!$error) { @@ -1027,12 +1053,13 @@ if (isset($_POST["import_assets_csv"])) { fgetcsv($file, 1000, ","); // Skip first line $row_count = 0; $duplicate_count = 0; + $spec_rows = []; while(($column = fgetcsv($file, 1000, ",")) !== false) { - // Default variables (if undefined) - $description = $type = $make = $model = $serial = $os = ''; + // Default variables (if undefined) - each row starts empty, nothing carried from the last + $description = $type = $make = $model = $serial = $os = $physical_location = $notes = ''; $contact_id = $location_id = 0; - $purchase_date = '0000-00-00'; + $purchase_date = 'NULL'; $duplicate_detect = 0; @@ -1049,9 +1076,9 @@ if (isset($_POST["import_assets_csv"])) { $description = escapeSql($column[1]); } - // Type + // Type - as the list spells it, when it is one if (!empty($column[2])) { - $type = escapeSql($column[2]); + $type = escapeSql(assetTypeName($column[2]) ?: $column[2]); } // Make @@ -1091,7 +1118,7 @@ if (isset($_POST["import_assets_csv"])) { if ($contact) { $sql_contact = mysqli_query($mysqli,"SELECT contact_id FROM contacts WHERE contact_name = '$contact' AND contact_client_id = $client_id"); $row = mysqli_fetch_assoc($sql_contact); - $contact_id = intval($row['contact_id']); + $contact_id = intval($row['contact_id'] ?? 0); } } @@ -1101,7 +1128,7 @@ if (isset($_POST["import_assets_csv"])) { if ($location) { $sql_location = mysqli_query($mysqli,"SELECT location_id FROM locations WHERE location_name = '$location' AND location_client_id = $client_id"); $row = mysqli_fetch_assoc($sql_location); - $location_id = intval($row['location_id']); + $location_id = intval($row['location_id'] ?? 0); } } @@ -1125,6 +1152,15 @@ if (isset($_POST["import_assets_csv"])) { // Add Primary Interface mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_primary = 1, interface_asset_id = $asset_id"); + // Its details, from the columns after the twelve - kept once every row is in, so a VM's host can come later in the file + $spec_input = []; + foreach ($spec_columns as $index => $spec_key) { + $spec_input[$spec_key] = (string) ($column[$index] ?? ''); + } + if ($spec_input) { + $spec_rows[] = [$asset_id, $column[0], $column[2] ?? '', $spec_input]; + } + $row_count = $row_count + 1; } else { $duplicate_count = $duplicate_count + 1; @@ -1132,9 +1168,22 @@ if (isset($_POST["import_assets_csv"])) { } fclose($file); + // The details, and the ports they count; what wasn't kept, by asset + $spec_problems = []; + foreach ($spec_rows as [$spec_asset_id, $spec_asset_name, $spec_type, $spec_input]) { + [, $problems] = assetSpecsFromPost($spec_asset_id, $spec_type, $spec_input, $client_id); + if ($problems) { + $spec_problems[] = $spec_asset_name . ' (' . implode('; ', $problems) . ')'; + } + } + logAudit("Asset", "Import", "$session_name imported $row_count asset(s) via CSV file", $client_id); - flashAlert("$row_count Asset(s) added, $duplicate_count duplicate(s) detected"); + if ($spec_problems) { + flashAlert("$row_count Asset(s) added, $duplicate_count duplicate(s) detected - details not kept: " . escapeHtml(implode(', ', array_slice($spec_problems, 0, 5)) . (count($spec_problems) > 5 ? ' and ' . (count($spec_problems) - 5) . ' more' : '')), 'warning'); + } else { + flashAlert("$row_count Asset(s) added, $duplicate_count duplicate(s) detected"); + } redirect(); @@ -1223,35 +1272,23 @@ if (isExportRequest('export_assets')) { $archive_query = $client_id ? "asset_archived_at IS NULL" : "(client_archived_at IS NULL AND asset_archived_at IS NULL)"; } - // Type Filter - $type = $_POST['type'] ?? ''; - if ($type == 'workstation') { - $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'"; - } elseif ($type == 'server') { - $type_query = "asset_type = 'server'"; - } elseif ($type == 'virtual') { - $type_query = "asset_type = 'Virtual Machine'"; - } elseif ($type == 'network') { - $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'"; - } elseif ($type == 'printer') { - $type_query = "asset_type = 'Printer'"; - } elseif ($type == 'other') { - $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point' AND asset_type NOT LIKE 'printer'"; + // Type Filter - the assets list's tabs (functions/asset_type.php) + $type_tabs = assetTypeTabs(); + $type = (string) ($_POST['type'] ?? ''); + if (isset($type_tabs[$type])) { + $type_query = $type_tabs[$type]['query']; + $filter_summary['Type'] = $type_tabs[$type]['label']; } else { // Default - any $type = ''; $type_query = "asset_type LIKE '%'"; } - if ($type) { - $filter_summary['Type'] = ucwords($type); - } // Location Filter if (!empty($_POST['location'])) { $filter_location_id = intval($_POST['location']); $location_query = "AND (asset_location_id = $filter_location_id)"; - $location_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT location_name FROM locations WHERE location_id = $filter_location_id")); - $filter_summary['Location'] = $location_row['location_name'] ?? ''; + $filter_summary['Location'] = exportRecordName('locations', $filter_location_id, 'location_name', 'location_client_id'); } else { // Default - any $location_query = ''; @@ -1336,7 +1373,12 @@ if (isExportRequest('export_assets')) { $export = beginExport('assets', $format, $file_name_prepend . 'Assets', 'Assets', summarizeExportFilters($filter_summary)); + // Each with its details, should any of their columns be picked (functions/asset_type.php) + $export_rows = []; while ($row = mysqli_fetch_assoc($sql)) { + $export_rows[] = $row; + } + foreach (assetSpecsExportAttach($export_rows) as $row) { addExportRow($export, $row); } diff --git a/agent/rack.php b/agent/rack.php index a9dd04063..6418525cc 100644 --- a/agent/rack.php +++ b/agent/rack.php @@ -72,9 +72,9 @@ if (mysqli_num_rows($sql) == 0) { $sql_unracked = 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 - AND asset_type IN ('Server', 'Switch', 'Firewall/Router') + AND asset_type IN ('" . implode("', '", array_map('escapeSql', ASSET_RACK_TYPES)) . "') AND NOT EXISTS (SELECT 1 FROM rack_units WHERE unit_asset_id = asset_id) - ORDER BY FIELD(asset_type, 'Firewall/Router', 'Switch', 'Server'), asset_name + ORDER BY FIELD(asset_type, '" . implode("', '", array_map('escapeSql', ASSET_RACK_TYPES)) . "'), asset_name LIMIT 25"); while ($unracked_row = mysqli_fetch_assoc($sql_unracked)) { $unracked_assets[] = $unracked_row; diff --git a/api/v1/assets/asset_model.php b/api/v1/assets/asset_model.php index a3cec0ec2..aad46bc20 100644 --- a/api/v1/assets/asset_model.php +++ b/api/v1/assets/asset_model.php @@ -18,7 +18,7 @@ if (isset($_POST['asset_description'])) { } if (isset($_POST['asset_type'])) { - $type = escapeSql($_POST['asset_type']); + $type = escapeSql(assetTypeName($_POST['asset_type']) ?: $_POST['asset_type']); // as the list spells it, when it is one (functions/asset_type.php) } elseif (isset($asset_row) && isset($asset_row['asset_type'])) { $type = mysqli_real_escape_string($mysqli, $asset_row['asset_type']); } else { diff --git a/api/v1/assets/create.php b/api/v1/assets/create.php index 399cc9b89..f64be62df 100644 --- a/api/v1/assets/create.php +++ b/api/v1/assets/create.php @@ -22,6 +22,14 @@ if (!empty($name) && !empty($client_id)) { // Add Primary Interface mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_mac = '$mac', interface_ip = '$ip', interface_primary = 1, interface_network_id = $network, interface_asset_id = $insert_id"); + // Its details - asset_specs {key: value}, its type's (functions/asset_type.php) - and the ports they count + if (isset($_POST['asset_specs']) && is_array($_POST['asset_specs'])) { + [, $spec_problems] = assetSpecsFromPost($insert_id, $_POST['asset_type'] ?? '', $_POST['asset_specs'], $client_id); + if ($spec_problems) { + $return_arr['asset_specs_not_kept'] = $spec_problems; + } + } + // Logging logAudit("Asset", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); logAudit("API", "Success", "Created asset $name via API ($api_key_name)", $client_id); diff --git a/api/v1/assets/read.php b/api/v1/assets/read.php index 6ee3dad23..6aeafb86a 100644 --- a/api/v1/assets/read.php +++ b/api/v1/assets/read.php @@ -47,4 +47,5 @@ if (isset($_GET['asset_id'])) { // Output $api_tag_entity = 'asset'; // each one's tags +$api_asset_specs = true; // and its details (functions/asset_type.php) require_once "../read_output.php"; diff --git a/api/v1/assets/update.php b/api/v1/assets/update.php index e185af7e4..e409f58b4 100644 --- a/api/v1/assets/update.php +++ b/api/v1/assets/update.php @@ -30,6 +30,15 @@ if (!empty($asset_id)) { // Update Primary Interface mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_mac = '$mac', interface_ip = '$ip', interface_network_id = $network WHERE interface_asset_id = $asset_id AND interface_primary = 1"); + // Its details - asset_specs {key: value} on top of what it has, '' clearing one; and a type it changed to keeps only its own + if ((isset($_POST['asset_specs']) && is_array($_POST['asset_specs'])) || isset($_POST['asset_type'])) { + $spec_input = array_merge(assetSpecs($asset_id), isset($_POST['asset_specs']) && is_array($_POST['asset_specs']) ? $_POST['asset_specs'] : []); + [, $spec_problems] = assetSpecsFromPost($asset_id, $_POST['asset_type'] ?? $asset_row['asset_type'], $spec_input, $client_id); + if ($spec_problems) { + $return_arr['asset_specs_not_kept'] = $spec_problems; + } + } + // Add to History mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = '$status', asset_history_description = 'API updated $name ($api_key_name)', asset_history_asset_id = $asset_id"); diff --git a/api/v1/read_output.php b/api/v1/read_output.php index aa07a0b2e..1614188b5 100644 --- a/api/v1/read_output.php +++ b/api/v1/read_output.php @@ -20,6 +20,11 @@ if ($sql && mysqli_num_rows($sql) > 0) { $return_arr['data'] = tagApiAttach($return_arr['data'], $api_tag_entity); } + // Each asset's details, as asset_specs ($api_asset_specs, set by api/v1/assets/read.php) + if (!empty($api_asset_specs)) { + $return_arr['data'] = assetSpecsApiAttach($return_arr['data']); + } + echo json_encode($return_arr); exit(); } diff --git a/client/functions.php b/client/functions.php index 710489b52..5612d5ef0 100644 --- a/client/functions.php +++ b/client/functions.php @@ -534,11 +534,13 @@ function portalAssetScopeSql() { /** The tabs on Devices - each kind with its label, icon and SQL on asset_type; Other is whatever the rest don't take. */ function portalAssetGroups() { + // By the type's group (ASSET_TYPES, functions/asset_type.php) $kinds = [ - 'computers' => ['Computers', 'fa-desktop', ['Desktop', 'Laptop']], - 'servers' => ['Servers', 'fa-server', ['Server', 'Virtual Machine']], - 'network' => ['Network', 'fa-network-wired', ['Switch', 'Firewall/Router', 'Access Point']], - 'phones' => ['Phones & tablets', 'fa-mobile-alt', ['Phone', 'Mobile Phone', 'Tablet']], + 'computers' => ['Computers', 'fa-desktop', assetTypesInGroup('workstation')], + 'servers' => ['Servers', 'fa-server', assetTypesInGroup('server', 'virtual')], + 'network' => ['Network', 'fa-network-wired', assetTypesInGroup('network')], + 'power' => ['Power', 'fa-car-battery', assetTypesInGroup('power')], + 'phones' => ['Phones & tablets', 'fa-mobile-alt', assetTypesInGroup('mobile')], ]; $groups = ['all' => ['label' => 'All', 'icon' => 'fa-list', 'where' => '1 = 1']]; $taken = []; diff --git a/cron/nightly_tasks.php b/cron/nightly_tasks.php index d0a2809f4..c4b78dfc4 100644 --- a/cron/nightly_tasks.php +++ b/cron/nightly_tasks.php @@ -346,6 +346,21 @@ foreach ($warranty_alert_array as $day) { // Logging // logAudit("Cron", "Task", "Cron created notifications for asset warranties expiring"); +// UPS batteries due for replacing - the same days ahead as warranties (asset_specs, functions/asset_type.php) +foreach (assetSpecsReady() ? $warranty_alert_array : [] as $day) { + $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_spec_value, client_id, client_name FROM asset_specs + JOIN assets ON asset_id = asset_spec_asset_id + JOIN clients ON asset_client_id = client_id + WHERE asset_spec_key = 'battery_replace' AND asset_spec_value = CURDATE() + INTERVAL $day DAY + AND asset_type = 'UPS' AND asset_archived_at IS NULL AND client_archived_at IS NULL"); + while ($row = mysqli_fetch_assoc($sql)) { + $asset_id = intval($row['asset_id']); + $client_id = intval($row['client_id']); + appNotify("UPS Battery Due", "The battery in " . escapeSql($row['asset_name']) . " for " . escapeSql($row['client_name']) . " is due for replacing in $day day" . ($day === 1 ? '' : 's') . ", on " . escapeSql($row['asset_spec_value']), + "/agent/asset.php?client_id=$client_id&asset_id=$asset_id", $client_id); + } +} + // Services due for review - said once, the day it falls due $sql = mysqli_query($mysqli, "SELECT service_id, service_name, service_importance, client_id, client_name FROM services JOIN clients ON service_client_id = client_id diff --git a/css/itflow_custom.css b/css/itflow_custom.css index a459fb385..502939497 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -3901,6 +3901,8 @@ button.itflow-rack-item-body:hover { .itflow-asset-tone-phone { --itflow-asset-tone: #b8862f; } .itflow-asset-tone-peripheral { --itflow-asset-tone: #5b6f8a; } .itflow-asset-tone-other { --itflow-asset-tone: #6c757d; } +.itflow-asset-tone-storage { --itflow-asset-tone: #5f7a2a; } +.itflow-asset-tone-power { --itflow-asset-tone: #b5600b; } [data-bs-theme="dark"] .itflow-asset-tone-workstation { --itflow-asset-tone: #6f9fe0; } [data-bs-theme="dark"] .itflow-asset-tone-server { --itflow-asset-tone: #a197ee; } [data-bs-theme="dark"] .itflow-asset-tone-virtual { --itflow-asset-tone: #c595ea; } @@ -3910,6 +3912,8 @@ button.itflow-rack-item-body:hover { [data-bs-theme="dark"] .itflow-asset-tone-phone { --itflow-asset-tone: #e3b35c; } [data-bs-theme="dark"] .itflow-asset-tone-peripheral { --itflow-asset-tone: #9fb2cc; } [data-bs-theme="dark"] .itflow-asset-tone-other { --itflow-asset-tone: #adb5bd; } +[data-bs-theme="dark"] .itflow-asset-tone-storage { --itflow-asset-tone: #a6c46b; } +[data-bs-theme="dark"] .itflow-asset-tone-power { --itflow-asset-tone: #f2a453; } .itflow-asset-icon { display: inline-flex; flex: 0 0 auto; @@ -5642,6 +5646,11 @@ img.itflow-contact-avatar { gap: .35rem; padding: 1rem; } +/* Between the copper ports and the SFP cages - a row of their own */ +.itflow-port-break { + flex-basis: 100%; + height: .15rem; +} .itflow-port { position: relative; display: inline-flex; diff --git a/db.sql b/db.sql index d5ff51f78..635f4c39d 100644 --- a/db.sql +++ b/db.sql @@ -380,6 +380,25 @@ CREATE TABLE `asset_notes` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `asset_specs` +-- + +DROP TABLE IF EXISTS `asset_specs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `asset_specs` ( + `asset_spec_id` int(11) NOT NULL AUTO_INCREMENT, + `asset_spec_asset_id` int(11) NOT NULL, + `asset_spec_key` varchar(50) NOT NULL, + `asset_spec_value` varchar(255) NOT NULL, + PRIMARY KEY (`asset_spec_id`), + UNIQUE KEY `asset_spec_asset_key` (`asset_spec_asset_id`,`asset_spec_key`), + KEY `asset_spec_key` (`asset_spec_key`,`asset_spec_value`(20)), + CONSTRAINT `asset_specs_asset` FOREIGN KEY (`asset_spec_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `asset_tags` -- diff --git a/functions.php b/functions.php index 84862d8d0..40d0bfa34 100644 --- a/functions.php +++ b/functions.php @@ -25,6 +25,7 @@ require_once __DIR__ . '/functions/api_keys.php'; require_once __DIR__ . '/functions/asset_interface.php'; require_once __DIR__ . '/functions/rack.php'; require_once __DIR__ . '/functions/asset.php'; +require_once __DIR__ . '/functions/asset_type.php'; require_once __DIR__ . '/functions/contact.php'; require_once __DIR__ . '/functions/software.php'; require_once __DIR__ . '/functions/software_template.php'; diff --git a/functions/ai_document.php b/functions/ai_document.php index 8e8241c71..5c488b41c 100644 --- a/functions/ai_document.php +++ b/functions/ai_document.php @@ -75,8 +75,8 @@ function aiClientProfile($client_id) { $lines[] = 'Assets: ' . implode(', ', $counts); } $list('Servers and network gear', "SELECT asset_name, asset_type, asset_make, asset_model, asset_os FROM assets - WHERE asset_client_id = $client_id AND asset_archived_at IS NULL AND asset_type IN ('Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point', 'Storage', 'NAS') - ORDER BY FIELD(asset_type, 'Firewall/Router', 'Server', 'Virtual Machine', 'Switch', 'Access Point'), asset_name LIMIT 25", + WHERE asset_client_id = $client_id AND asset_archived_at IS NULL AND (" . assetTypeGroupSql('server') . " OR " . assetTypeGroupSql('virtual') . " OR " . assetTypeGroupSql('network') . " OR " . assetTypeGroupSql('power') . ") + ORDER BY FIELD(asset_type, 'Firewall/Router', 'Server', 'NAS', 'Virtual Machine', 'Switch', 'Access Point'), asset_name LIMIT 25", function ($r) { return $r['asset_name'] . ' - ' . $r['asset_type'] . (trim($r['asset_make'] . ' ' . $r['asset_model']) !== '' ? ', ' . trim($r['asset_make'] . ' ' . $r['asset_model']) : '') . ($r['asset_os'] ? ", {$r['asset_os']}" : ''); }); $list('Networks', "SELECT network_name, network_type, network_vlan, network, network_gateway FROM networks WHERE network_client_id = $client_id AND network_archived_at IS NULL ORDER BY network_name LIMIT 15", function ($r) { return $r['network_name'] . ($r['network_type'] ? " ({$r['network_type']})" : '') . ($r['network'] ? " - {$r['network']}" : '') . ($r['network_vlan'] ? ", VLAN {$r['network_vlan']}" : '') . ($r['network_gateway'] ? ", gateway {$r['network_gateway']}" : ''); }); diff --git a/functions/app.php b/functions/app.php index fbef53d23..f4cb39308 100644 --- a/functions/app.php +++ b/functions/app.php @@ -3,38 +3,9 @@ // App/UI helpers - icons, badges, lookups, mail queue, iCal, taxes, update check // Split from the former monolithic functions.php +/** The icon of an asset type, without its fa- (laptop) - from ASSET_TYPES (functions/asset_type.php); a tag for one it doesn't know. */ function getAssetIcon($asset_type) { - if ($asset_type == 'Laptop') { - $device_icon = "laptop"; - } elseif ($asset_type == 'Desktop') { - $device_icon = "desktop"; - } elseif ($asset_type == 'Server') { - $device_icon = "server"; - } elseif ($asset_type == 'Printer') { - $device_icon = "print"; - } elseif ($asset_type == 'Camera') { - $device_icon = "video"; - } elseif ($asset_type == 'Switch') { - $device_icon = "network-wired"; - } elseif ($asset_type == 'Firewall/Router') { - $device_icon = "fire-alt"; - } elseif ($asset_type == 'Access Point') { - $device_icon = "wifi"; - } elseif ($asset_type == 'Phone') { - $device_icon = "phone"; - } elseif ($asset_type == 'Mobile Phone') { - $device_icon = "mobile-alt"; - } elseif ($asset_type == 'Tablet') { - $device_icon = "tablet-alt"; - } elseif ($asset_type == 'Display') { - $device_icon = "tv"; - } elseif ($asset_type == 'Virtual Machine') { - $device_icon = "cloud"; - } else { - $device_icon = "tag"; - } - - return $device_icon; + return substr(assetTypeInfo($asset_type)['icon'], 3); } function getInvoiceBadgeColor($invoice_status) { diff --git a/functions/asset.php b/functions/asset.php index 3c4a43657..822694759 100644 --- a/functions/asset.php +++ b/functions/asset.php @@ -10,24 +10,9 @@ * them - escape anything that came from the database before echoing it. */ -/** The colour family an asset type is drawn in - a CSS class suffix (itflow-asset-tone-*). */ +/** The colour family an asset type is drawn in - a CSS class suffix (itflow-asset-tone-*), from ASSET_TYPES (functions/asset_type.php). */ function assetTypeTone($asset_type) { - $tones = [ - 'Laptop' => 'workstation', - 'Desktop' => 'workstation', - 'Server' => 'server', - 'Virtual Machine' => 'virtual', - 'Switch' => 'network', - 'Firewall/Router' => 'firewall', - 'Access Point' => 'wireless', - 'Phone' => 'phone', - 'Mobile Phone' => 'phone', - 'Tablet' => 'phone', - 'Printer' => 'peripheral', - 'Display' => 'peripheral', - 'Camera' => 'peripheral', - ]; - return $tones[(string) $asset_type] ?? 'other'; + return assetTypeInfo($asset_type)['tone']; } /** diff --git a/functions/asset_interface.php b/functions/asset_interface.php index c327690ea..505ffc46b 100644 --- a/functions/asset_interface.php +++ b/functions/asset_interface.php @@ -14,7 +14,16 @@ */ /** Asset types drawn as a row of ports on the asset page, not only a table. */ -const INTERFACE_PORT_MAP_TYPES = ['Switch', 'Firewall/Router', 'Access Point']; +const INTERFACE_PORT_MAP_TYPES = ['Switch', 'Firewall/Router', 'Access Point', 'Modem/ONT', 'NAS', 'NVR/DVR']; + +/** Interface types that are a cage for a module, not a copper port - an SFP port's kind. Matched without case. */ +const INTERFACE_SFP_TYPES = ['SFP', 'SFP+', 'SFP28', 'QSFP', 'QSFP+', 'QSFP28', 'QSFP-DD', 'Fiber']; + +/** Interface types that aren't a network port to count - radios, virtual and logical interfaces, coax, console. */ +const INTERFACE_NOT_PORT_PATTERN = '/\\b(wi-?fi|wireless|wlan|radio|virtual|vlan|loopback|bridge|tunnel|bond|lag|coax|coaxial|console|serial|cellular|lte|5g)\\b/i'; + +/** Interface names of a management port - mgmt0, iDRAC, iLO, IPMI - which isn't one of the ports a count counts, nor where their numbering goes on from. */ +const INTERFACE_MANAGEMENT_PATTERN = '/^(mgmt|management|ipmi|idrac|ilo|bmc|oob|console)[\\s\\/_-]?\\d*$/i'; /** One interface by id, with its asset, network and what it is connected to - raw, or null. */ function interfaceRow($interface_id) { @@ -421,6 +430,122 @@ function interfaceSort(array &$rows) { }); } +/** + * Where a run of new ports on an asset carries on from - [prefix, start, pad]: + * the numbered run it has most of (Gi1/0/1-24, not mgmt0), with its + * zero-padding, from the number after its last; or, with none, the prefix + * its type starts from. $sfp looks only at its SFP cages (INTERFACE_SFP_TYPES) + * and starts "SFP 1"; otherwise only at the rest. + */ +function interfaceSeriesNext($asset_id, $asset_type, $sfp = false) { + global $mysqli; + $names = []; + $sql = mysqli_query($mysqli, "SELECT interface_name, interface_type FROM asset_interfaces WHERE interface_asset_id = " . intval($asset_id) . " AND interface_archived_at IS NULL"); + while ($sql && $row = mysqli_fetch_assoc($sql)) { + if (interfacePortKind($row['interface_type'], $row['interface_name']) === ($sfp ? 'sfp' : 'copper')) { + $names[] = $row['interface_name']; + } + } + $runs = []; + foreach ($names as $name) { + if (preg_match('/^(.*?)(\d+)$/', $name, $match)) { + $runs[$match[1]][] = $match[2]; + } + } + if (!$runs) { + if ($sfp) { + return ['SFP ', 1, 0]; + } + $prefix = $asset_type === 'Switch' ? 'Gi1/0/' : (in_array($asset_type, ['Firewall/Router', 'Access Point', 'Modem/ONT', 'NAS', 'NVR/DVR'], true) ? 'Port ' : 'eth'); + return [$prefix, $prefix === 'eth' ? 0 : 1, 0]; + } + uasort($runs, function ($a, $b) { + return count($b) <=> count($a); + }); + $prefix = (string) array_key_first($runs); + $pad = 0; + foreach ($runs[$prefix] as $number) { + if (strlen($number) > 1 && $number[0] === '0') { + $pad = strlen($number); + } + } + return [$prefix, max(array_map('intval', $runs[$prefix])) + 1, $pad]; +} + +/** Is this interface type an SFP cage (INTERFACE_SFP_TYPES)? */ +function interfaceIsSfp($interface_type) { + foreach (INTERFACE_SFP_TYPES as $sfp) { + if (strcasecmp($sfp, trim((string) $interface_type)) === 0) { + return true; + } + } + return false; +} + +/** + * What kind of port an interface is, by its type and name - 'sfp' + * (INTERFACE_SFP_TYPES), 'copper', or '' when it isn't one of the ports a + * count counts: a radio, VLAN or the like (INTERFACE_NOT_PORT_PATTERN), or a + * management port (INTERFACE_MANAGEMENT_PATTERN). + */ +function interfacePortKind($interface_type, $interface_name = '') { + if (preg_match(INTERFACE_MANAGEMENT_PATTERN, trim((string) $interface_name))) { + return ''; + } + if (interfaceIsSfp($interface_type)) { + return 'sfp'; + } + return preg_match(INTERFACE_NOT_PORT_PATTERN, (string) $interface_type) ? '' : 'copper'; +} + +/** + * An asset with $copper ports and $sfp SFP cages has that many interfaces - + * the ones missing are made, carrying on its numbering (interfaceSeriesNext()), + * as Ethernet and SFP where Admin > Categories has them. Never fewer: a port + * too many is left for someone to take off. How many were made, by kind. + */ +function interfacePortsEnsure($asset_id, $asset_type, $copper, $sfp) { + global $mysqli; + $asset_id = intval($asset_id); + $made = ['copper' => 0, 'sfp' => 0]; + $have = ['copper' => 0, 'sfp' => 0]; + $existing = []; + // Archived ones keep their names (no second "05"), and only ports count - not a radio or a VLAN + $sql = mysqli_query($mysqli, "SELECT interface_name, interface_type, interface_archived_at FROM asset_interfaces WHERE interface_asset_id = $asset_id"); + while ($sql && $row = mysqli_fetch_assoc($sql)) { + $existing[mb_strtolower($row['interface_name'])] = true; + $kind = interfacePortKind($row['interface_type'], $row['interface_name']); + if ($kind !== '' && $row['interface_archived_at'] === null) { + $have[$kind]++; + } + } + $types = interfaceTypes(); + foreach (['copper' => intval($copper), 'sfp' => intval($sfp)] as $kind => $want) { + $missing = min(128, $want) - $have[$kind]; + if ($missing < 1) { + continue; + } + [$prefix, $start, $pad] = interfaceSeriesNext($asset_id, $asset_type, $kind === 'sfp'); + $type = $kind === 'sfp' ? (isset($types['SFP']) ? 'SFP' : (isset($types['SFP+']) ? 'SFP+' : 'SFP')) : (isset($types['Ethernet']) ? 'Ethernet' : ''); + $number = $start; + while ($made[$kind] < $missing && $number < $start + 1000) { + $name = $prefix . str_pad((string) $number, $pad, '0', STR_PAD_LEFT); + $number++; + if (isset($existing[mb_strtolower($name)])) { + continue; + } + $existing[mb_strtolower($name)] = true; + mysqli_query($mysqli, "INSERT INTO asset_interfaces SET interface_name = '" . escapeSql(mb_substr($name, 0, 200)) . "', interface_type = " . ($type === '' ? 'NULL' : "'" . escapeSql($type) . "'") . ", interface_asset_id = $asset_id"); + $made[$kind]++; + } + // The primary, counted as a port, is one too - when it has no type of its own yet + if ($kind === 'copper' && $made['copper'] && $type !== '') { + mysqli_query($mysqli, "UPDATE asset_interfaces SET interface_type = '" . escapeSql($type) . "' WHERE interface_asset_id = $asset_id AND interface_primary = 1 AND IFNULL(interface_type, '') = ''"); + } + } + return $made; +} + /** The interface names a "New interfaces" run makes: prefix, then each number from start, padded. */ function interfaceSeriesNames($prefix, $start, $count, $pad) { $names = []; diff --git a/functions/asset_type.php b/functions/asset_type.php new file mode 100644 index 000000000..ffcf4a09b --- /dev/null +++ b/functions/asset_type.php @@ -0,0 +1,585 @@ + icon, tone, group, fields + * (from ASSET_FIELDS), os (what the OS field is called on it: 'os' or + * 'firmware'), specs (keys of ASSET_SPECS) and example (what the form's + * name, description, make, model and OS fields suggest for it). + */ +const ASSET_TYPES = [ + 'Laptop' => ['icon' => 'fa-laptop', 'tone' => 'workstation', 'group' => 'workstation', 'os' => 'os', + 'fields' => ['contact', 'os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['cpu', 'ram_gb', 'storage'], + 'example' => ['name' => 'RDG-LT-04', 'description' => 'Front desk laptop', 'make' => 'Dell', 'model' => 'Latitude 5450', 'os' => 'Windows 11 Pro 24H2']], + 'Desktop' => ['icon' => 'fa-desktop', 'tone' => 'workstation', 'group' => 'workstation', 'os' => 'os', + 'fields' => ['contact', 'os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['cpu', 'ram_gb', 'storage'], + 'example' => ['name' => 'RDG-WS-12', 'description' => 'Reception PC', 'make' => 'HP', 'model' => 'EliteDesk 800 G9', 'os' => 'Windows 11 Pro 24H2']], + 'Server' => ['icon' => 'fa-server', 'tone' => 'server', 'group' => 'server', 'os' => 'os', + 'fields' => ['os', 'network', 'nat', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['cpu', 'ram_gb', 'storage'], + 'example' => ['name' => 'SRV-DC01', 'description' => 'Domain controller for HQ', 'make' => 'Dell', 'model' => 'PowerEdge R650', 'os' => 'Windows Server 2022']], + 'NAS' => ['icon' => 'fa-hdd', 'tone' => 'storage', 'group' => 'server', 'os' => 'os', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['drive_bays', 'drives', 'raw_tb', 'usable_tb', 'raid', 'ports'], + 'example' => ['name' => 'NAS-01', 'description' => 'File shares and backups', 'make' => 'Synology', 'model' => 'DS923+', 'os' => 'DSM 7.2']], + 'Virtual Machine' => ['icon' => 'fa-cloud', 'tone' => 'virtual', 'group' => 'virtual', 'os' => 'os', + 'fields' => ['os', 'network', 'nat', 'links'], 'specs' => ['vm_host', 'vcpus', 'ram_gb', 'storage'], + 'example' => ['name' => 'VM-APP-01', 'description' => 'Line of business app', 'make' => 'Microsoft', 'model' => 'Hyper-V', 'os' => 'Ubuntu 24.04']], + 'Firewall/Router' => ['icon' => 'fa-fire-alt', 'tone' => 'firewall', 'group' => 'network', 'os' => 'firmware', + 'fields' => ['os', 'network', 'nat', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['ports', 'sfp_ports'], + 'example' => ['name' => 'FW-01', 'description' => 'Edge firewall', 'make' => 'Netgate', 'model' => '6100', 'os' => 'pfSense Plus 24.11']], + 'Switch' => ['icon' => 'fa-network-wired', 'tone' => 'network', 'group' => 'network', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['ports', 'sfp_ports', 'poe_watts', 'managed'], + 'example' => ['name' => 'SW-CORE-01', 'description' => 'Core switch, comms closet', 'make' => 'Cisco', 'model' => 'Catalyst 9200L-24P', 'os' => 'IOS-XE 17.9']], + 'Access Point' => ['icon' => 'fa-wifi', 'tone' => 'wireless', 'group' => 'network', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['wifi'], + 'example' => ['name' => 'AP-LOBBY', 'description' => 'Lobby ceiling', 'make' => 'Ubiquiti', 'model' => 'U7 Pro', 'os' => 'UniFi 7.0']], + 'Modem/ONT' => ['icon' => 'fa-broadcast-tower', 'tone' => 'network', 'group' => 'network', 'os' => 'firmware', + 'fields' => ['os', 'network', 'nat', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['circuit_id', 'isp_account', 'ports'], + 'example' => ['name' => 'ONT-01', 'description' => 'Fiber handoff', 'make' => 'Nokia', 'model' => 'G-010G-A', 'os' => '3FE49362']], + 'UPS' => ['icon' => 'fa-car-battery', 'tone' => 'power', 'group' => 'power', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['va', 'watts', 'runtime_min', 'outlets', 'battery_installed', 'battery_replace'], + 'example' => ['name' => 'UPS-RACK-01', 'description' => 'Rack UPS, comms closet', 'make' => 'APC', 'model' => 'SMT1500RM2UC', 'os' => 'NMC 2.6']], + 'PDU' => ['icon' => 'fa-plug', 'tone' => 'power', 'group' => 'power', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['pdu_type', 'outlets', 'power_input'], + 'example' => ['name' => 'PDU-RACK-01', 'description' => 'Rack PDU, A side', 'make' => 'APC', 'model' => 'AP7900B', 'os' => 'RPDU 7.1']], + 'Printer' => ['icon' => 'fa-print', 'tone' => 'peripheral', 'group' => 'printer', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['color', 'supplies'], + 'example' => ['name' => 'PRN-FRONT', 'description' => 'Front desk printer', 'make' => 'HP', 'model' => 'LaserJet Pro M404dn', 'os' => 'FutureSmart 5.7']], + 'Phone' => ['icon' => 'fa-phone', 'tone' => 'phone', 'group' => 'mobile', 'os' => 'firmware', + 'fields' => ['contact', 'os', 'network', 'serial', 'purchase', 'warranty'], 'specs' => ['extension'], + 'example' => ['name' => 'PH-204', 'description' => 'Front desk phone', 'make' => 'Yealink', 'model' => 'T54W', 'os' => '96.86.0.55']], + 'Mobile Phone' => ['icon' => 'fa-mobile-alt', 'tone' => 'phone', 'group' => 'mobile', 'os' => 'os', + 'fields' => ['contact', 'os', 'serial', 'purchase', 'warranty'], 'specs' => ['phone_number', 'carrier', 'imei'], + 'example' => ['name' => 'MOB-CEO', 'description' => "Owner's phone", 'make' => 'Apple', 'model' => 'iPhone 15', 'os' => 'iOS 18']], + 'Tablet' => ['icon' => 'fa-tablet-alt', 'tone' => 'phone', 'group' => 'mobile', 'os' => 'os', + 'fields' => ['contact', 'os', 'serial', 'purchase', 'warranty'], 'specs' => ['phone_number', 'carrier', 'imei'], + 'example' => ['name' => 'TAB-CHECKIN', 'description' => 'Patient check-in tablet', 'make' => 'Apple', 'model' => 'iPad (10th gen)', 'os' => 'iPadOS 18']], + 'Display' => ['icon' => 'fa-tv', 'tone' => 'peripheral', 'group' => 'peripheral', 'os' => 'os', + 'fields' => ['contact', 'serial', 'purchase', 'warranty'], 'specs' => ['size_in', 'resolution'], + 'example' => ['name' => 'MON-RECEPTION', 'description' => 'Reception monitor', 'make' => 'Dell', 'model' => 'P2723D', 'os' => '']], + 'Camera' => ['icon' => 'fa-video', 'tone' => 'peripheral', 'group' => 'peripheral', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['resolution'], + 'example' => ['name' => 'CAM-LOBBY', 'description' => 'Lobby entrance', 'make' => 'Hikvision', 'model' => 'DS-2CD2347G2', 'os' => 'V5.7.12']], + 'NVR/DVR' => ['icon' => 'fa-photo-video', 'tone' => 'storage', 'group' => 'peripheral', 'os' => 'firmware', + 'fields' => ['os', 'network', 'links', 'serial', 'purchase', 'warranty'], 'specs' => ['channels', 'storage', 'ports'], + 'example' => ['name' => 'NVR-01', 'description' => 'Camera recorder', 'make' => 'Hikvision', 'model' => 'DS-7616NI-K2', 'os' => 'V4.62']], + 'Other' => ['icon' => 'fa-tag', 'tone' => 'other', 'group' => 'other', 'os' => 'os', + 'fields' => ASSET_FIELDS, 'specs' => [], + 'example' => ['name' => 'ASSET-01', 'description' => 'What it is for', 'make' => 'Make', 'model' => 'Model', 'os' => '']], +]; + +/** + * The details, by key - label, input (text, number, select, date or asset), + * icon and, by input: unit, min, max, step, options (select), suggest (a + * text field's suggestions), asset_types (an asset pick, of the same + * client), placeholder, ports ('copper' or 'sfp' - a count of interfaces) and + * flag (a date that is flagged as it nears, like a warranty); unit_only, one + * that belongs to the one unit (an IMEI, a circuit) and isn't copied with it; + * alone, one whose value says what it is (Managed, Wi-Fi 6), so a short line + * of an asset's details leaves its label off. + */ +const ASSET_SPECS = [ + 'cpu' => ['label' => 'CPU', 'input' => 'text', 'icon' => 'fa-microchip', 'placeholder' => 'Intel Core i7-1365U'], + 'ram_gb' => ['label' => 'RAM', 'input' => 'number', 'icon' => 'fa-memory', 'unit' => 'GB', 'min' => 0, 'max' => 1048576, 'step' => 'any', 'placeholder' => '16'], + 'storage' => ['label' => 'Storage', 'input' => 'text', 'icon' => 'fa-hdd', 'placeholder' => '512 GB NVMe SSD'], + 'vm_host' => ['label' => 'Host', 'input' => 'asset', 'icon' => 'fa-server', 'asset_types' => ['Server', 'NAS']], + 'vcpus' => ['label' => 'vCPUs', 'input' => 'number', 'icon' => 'fa-microchip', 'min' => 1, 'max' => 4096, 'step' => 1, 'placeholder' => '4'], + 'ports' => ['label' => 'Ports', 'input' => 'number', 'icon' => 'fa-ethernet', 'min' => 0, 'max' => 128, 'step' => 1, 'placeholder' => '24', 'ports' => 'copper'], + 'sfp_ports' => ['label' => 'SFP ports', 'input' => 'number', 'icon' => 'fa-ethernet', 'min' => 0, 'max' => 64, 'step' => 1, 'placeholder' => '4', 'ports' => 'sfp'], + 'poe_watts' => ['label' => 'PoE budget', 'input' => 'number', 'icon' => 'fa-bolt', 'unit' => 'W', 'min' => 0, 'max' => 100000, 'step' => 'any', 'placeholder' => '370'], + 'managed' => ['label' => 'Management', 'input' => 'select', 'icon' => 'fa-sliders-h', 'options' => ['Managed', 'Smart', 'Unmanaged'], 'alone' => true], + 'wifi' => ['label' => 'Wi-Fi', 'input' => 'select', 'icon' => 'fa-wifi', 'alone' => true, 'options' => ['Wi-Fi 4 (802.11n)', 'Wi-Fi 5 (802.11ac)', 'Wi-Fi 6 (802.11ax)', 'Wi-Fi 6E', 'Wi-Fi 7 (802.11be)']], + 'drive_bays' => ['label' => 'Drive bays', 'input' => 'number', 'icon' => 'fa-th-large', 'min' => 0, 'max' => 1000, 'step' => 1, 'placeholder' => '4'], + 'drives' => ['label' => 'Drives', 'input' => 'text', 'icon' => 'fa-hdd', 'placeholder' => '4 x 8 TB WD Red Plus'], + 'raw_tb' => ['label' => 'Raw capacity', 'input' => 'number', 'icon' => 'fa-database', 'unit' => 'TB', 'min' => 0, 'max' => 1000000, 'step' => 'any', 'placeholder' => '32'], + 'usable_tb' => ['label' => 'Usable capacity', 'input' => 'number', 'icon' => 'fa-database', 'unit' => 'TB', 'min' => 0, 'max' => 1000000, 'step' => 'any', 'placeholder' => '24'], + 'raid' => ['label' => 'RAID', 'input' => 'text', 'icon' => 'fa-layer-group', 'placeholder' => 'RAID 5, SHR-2, RAIDZ2', 'suggest' => ['RAID 1', 'RAID 5', 'RAID 6', 'RAID 10', 'SHR', 'SHR-2', 'RAIDZ1', 'RAIDZ2', 'RAIDZ3', 'JBOD']], + 'va' => ['label' => 'Capacity', 'input' => 'number', 'icon' => 'fa-bolt', 'unit' => 'VA', 'min' => 0, 'max' => 10000000, 'step' => 'any', 'placeholder' => '1500'], + 'watts' => ['label' => 'Output', 'input' => 'number', 'icon' => 'fa-plug', 'unit' => 'W', 'min' => 0, 'max' => 10000000, 'step' => 'any', 'placeholder' => '1000'], + 'runtime_min' => ['label' => 'Runtime', 'input' => 'number', 'icon' => 'fa-hourglass-half', 'unit' => 'min', 'min' => 0, 'max' => 100000, 'step' => 'any', 'placeholder' => '12'], + 'outlets' => ['label' => 'Outlets', 'input' => 'number', 'icon' => 'fa-plug', 'min' => 0, 'max' => 1000, 'step' => 1, 'placeholder' => '8'], + 'battery_installed' => ['label' => 'Battery installed', 'input' => 'date', 'icon' => 'fa-battery-full'], + 'battery_replace' => ['label' => 'Replace battery by', 'input' => 'date', 'icon' => 'fa-battery-quarter', 'flag' => true], + 'pdu_type' => ['label' => 'Kind', 'input' => 'select', 'icon' => 'fa-plug', 'options' => ['Basic', 'Metered', 'Monitored', 'Switched'], 'alone' => true], + 'power_input' => ['label' => 'Input', 'input' => 'text', 'icon' => 'fa-bolt', 'placeholder' => 'NEMA L5-30P, 30 A'], + 'circuit_id' => ['label' => 'Circuit ID', 'input' => 'text', 'icon' => 'fa-fingerprint', 'placeholder' => '12.KXFN.012345..ATI', 'unit_only' => true], + 'isp_account' => ['label' => 'ISP account', 'input' => 'text', 'icon' => 'fa-hashtag', 'placeholder' => '8301 2245 0019 4410', 'unit_only' => true], + 'channels' => ['label' => 'Channels', 'input' => 'number', 'icon' => 'fa-video', 'min' => 0, 'max' => 1024, 'step' => 1, 'placeholder' => '16'], + 'color' => ['label' => 'Prints in', 'input' => 'select', 'icon' => 'fa-palette', 'options' => ['Color', 'Black and white'], 'alone' => true], + 'supplies' => ['label' => 'Supplies', 'input' => 'text', 'icon' => 'fa-fill-drip', 'placeholder' => 'HP 58A toner'], + 'extension' => ['label' => 'Extension', 'input' => 'text', 'icon' => 'fa-phone', 'placeholder' => '204', 'unit_only' => true], + 'phone_number' => ['label' => 'Phone number', 'input' => 'text', 'icon' => 'fa-phone', 'placeholder' => '412-555-0134', 'unit_only' => true], + 'carrier' => ['label' => 'Carrier', 'input' => 'text', 'icon' => 'fa-signal', 'placeholder' => 'Verizon'], + 'imei' => ['label' => 'IMEI', 'input' => 'text', 'icon' => 'fa-sim-card', 'placeholder' => '356938035643809', 'mono' => true, 'unit_only' => true], + 'size_in' => ['label' => 'Size', 'input' => 'number', 'icon' => 'fa-expand', 'unit' => 'in', 'min' => 0, 'max' => 1000, 'step' => 'any', 'placeholder' => '27'], + 'resolution' => ['label' => 'Resolution', 'input' => 'text', 'icon' => 'fa-th', 'placeholder' => '2560 x 1440, 4 MP', 'suggest' => ['1920 x 1080', '2560 x 1440', '3840 x 2160', '2 MP', '4 MP', '8 MP']], +]; + +/** The types that go in a rack - offered first when racking an asset, and on a rack page as kit not in one yet. */ +const ASSET_RACK_TYPES = ['Firewall/Router', 'Switch', 'Server', 'NAS', 'UPS', 'PDU', 'NVR/DVR', 'Modem/ONT']; + +/** The groups types fall into - for the assets list's tabs, the portal and the client overview. */ +const ASSET_TYPE_GROUPS = [ + 'workstation' => ['label' => 'Workstations', 'icon' => 'fa-desktop'], + 'server' => ['label' => 'Servers & storage', 'icon' => 'fa-server'], + 'virtual' => ['label' => 'Virtual', 'icon' => 'fa-cloud'], + 'network' => ['label' => 'Network', 'icon' => 'fa-network-wired'], + 'power' => ['label' => 'Power', 'icon' => 'fa-car-battery'], + 'printer' => ['label' => 'Printers', 'icon' => 'fa-print'], + 'mobile' => ['label' => 'Phones & tablets', 'icon' => 'fa-mobile-alt'], + 'peripheral' => ['label' => 'Displays & cameras', 'icon' => 'fa-tv'], + 'other' => ['label' => 'Other', 'icon' => 'fa-tag'], +]; + +/** A type's entry - Other's for a type that isn't one ITFlow knows, with its name. */ +function assetTypeInfo($asset_type) { + $asset_type = (string) $asset_type; + if (!isset(ASSET_TYPES[$asset_type])) { + // Spelt another way - 'switch', as the database matches it too - or not one at all + $asset_type = assetTypeName($asset_type) ?: 'Other'; + } + return ASSET_TYPES[$asset_type] + ['name' => $asset_type]; +} + +/** A type as the list spells it, matched without case - '' when it isn't one. */ +function assetTypeName($value) { + $value = trim((string) $value); + foreach (array_keys(ASSET_TYPES) as $asset_type) { + if (strcasecmp($asset_type, $value) === 0) { + return $asset_type; + } + } + return ''; +} + +/** Type => icon class (fa-laptop), in order - what $asset_types_array has always been. */ +function assetTypeIcons() { + return array_map(function ($type) { + return $type['icon']; + }, ASSET_TYPES); +} + +/** The types in one or more groups. */ +function assetTypesInGroup(...$groups) { + return array_keys(array_filter(ASSET_TYPES, function ($type) use ($groups) { + return in_array($type['group'], $groups, true); + })); +} + +/** + * SQL that matches a group's types on $column - 'other' is also anything + * that isn't a type ITFlow knows (an old or hand-made one). + */ +function assetTypeGroupSql($group, $column = 'asset_type') { + $in = function (array $types) { + return "'" . implode("', '", array_map('escapeSql', $types)) . "'"; + }; + if ($group === 'other') { + $known = array_diff(array_keys(ASSET_TYPES), assetTypesInGroup('other')); + return "$column NOT IN (" . $in($known) . ")"; + } + $types = assetTypesInGroup($group); + return $types ? "$column IN (" . $in($types) . ")" : '1 = 0'; +} + +/** + * The assets list's tabs - key => label, icon, what New calls one, and the + * SQL on asset_type. Other is every type the rest don't take, and any type + * ITFlow doesn't know. Shared with the export, which takes the same filter. + */ +function assetTypeTabs($column = 'asset_type') { + $tabs = [ + 'workstation' => ['label' => 'Workstations', 'new' => 'Workstation', 'groups' => ['workstation']], + 'server' => ['label' => 'Servers & NAS', 'new' => 'Server', 'groups' => ['server']], + 'virtual' => ['label' => 'Virtual', 'new' => 'Virtual Machine', 'groups' => ['virtual']], + 'network' => ['label' => 'Network', 'new' => 'Network Device', 'groups' => ['network']], + 'power' => ['label' => 'Power', 'new' => 'UPS', 'groups' => ['power']], + 'printer' => ['label' => 'Printers', 'new' => 'Printer', 'groups' => ['printer']], + ]; + $taken = []; + foreach ($tabs as $key => $tab) { + $types = assetTypesInGroup(...$tab['groups']); + $taken = array_merge($taken, $types); + $tabs[$key]['icon'] = ASSET_TYPE_GROUPS[$tab['groups'][0]]['icon']; + $tabs[$key]['query'] = "$column IN ('" . implode("', '", array_map('escapeSql', $types)) . "')"; + } + $tabs['other'] = ['label' => 'Other', 'new' => 'Asset', 'groups' => ['mobile', 'peripheral', 'other'], 'icon' => 'fa-tag', + 'query' => "$column NOT IN ('" . implode("', '", array_map('escapeSql', $taken)) . "')"]; + return $tabs; +} + +/** Does this type show the field (from ASSET_FIELDS)? */ +function assetTypeHasField($asset_type, $field) { + return in_array($field, assetTypeInfo($asset_type)['fields'], true); +} + +/** What the OS field is called on this type - "Operating system" or "Firmware". */ +function assetTypeOsLabel($asset_type) { + return assetTypeInfo($asset_type)['os'] === 'firmware' ? 'Firmware' : 'Operating system'; +} + +/** A type's details - key => ASSET_SPECS entry, in its order. */ +function assetTypeSpecs($asset_type) { + $specs = []; + foreach (assetTypeInfo($asset_type)['specs'] as $key) { + $specs[$key] = ASSET_SPECS[$key]; + } + return $specs; +} + +/** + * Is the asset_specs table there yet (database update 3.4.9)? Until it is, + * no asset has details - none are read, kept or flagged. + */ +function assetSpecsReady() { + global $mysqli; + static $ready = null; + if ($ready === null) { + $sql = mysqli_query($mysqli, "SHOW TABLES LIKE 'asset_specs'"); + $ready = $sql && mysqli_num_rows($sql) > 0; + } + return $ready; +} + +/** Each asset's details - [asset_id => [key => value]], raw. */ +function assetSpecsFor(array $asset_ids) { + global $mysqli; + $asset_ids = array_values(array_unique(array_filter(array_map('intval', $asset_ids)))); + $specs = array_fill_keys($asset_ids, []); + if (!$asset_ids || !assetSpecsReady()) { + return $specs; + } + $sql = mysqli_query($mysqli, "SELECT asset_spec_asset_id, asset_spec_key, asset_spec_value FROM asset_specs WHERE asset_spec_asset_id IN (" . implode(',', $asset_ids) . ")"); + while ($sql && $row = mysqli_fetch_assoc($sql)) { + $specs[intval($row['asset_spec_asset_id'])][$row['asset_spec_key']] = $row['asset_spec_value']; + } + return $specs; +} + +/** One asset's details, raw - [key => value]. */ +function assetSpecs($asset_id) { + return assetSpecsFor([$asset_id])[intval($asset_id)] ?? []; +} + +/** A number as it was meant - 16, not 16.00; 1.5 as typed. */ +function assetSpecNumber($value) { + $value = (float) $value; + return rtrim(rtrim(number_format($value, 2, '.', ''), '0'), '.'); +} + +/** + * What was given for a type's details, checked - [key => value] of the ones + * with a value, as they are to be kept. $problems gets a line for each one + * that isn't a value its field takes, which is left out. An asset pick has + * to be one of $client_id's own of the types the detail allows, and not the + * asset itself. + */ +function assetSpecsFromInput($asset_type, $input, $client_id, $asset_id = 0, &$problems = []) { + global $mysqli; + $problems = []; + $input = is_array($input) ? $input : []; + $kept = []; + foreach (assetTypeSpecs($asset_type) as $key => $spec) { + if (!array_key_exists($key, $input) || is_array($input[$key])) { + continue; + } + $value = trim((string) $input[$key]); + if ($value === '') { + continue; + } + switch ($spec['input']) { + case 'number': + $number = str_replace(',', '', $value); + if (!is_numeric($number) || (float) $number < ($spec['min'] ?? 0) || (float) $number > ($spec['max'] ?? PHP_INT_MAX) + || (($spec['step'] ?? 'any') === 1 && floor((float) $number) != (float) $number)) { + $problems[] = $spec['label'] . ': ' . (($spec['step'] ?? 'any') === 1 ? 'a whole number' : 'a number') . ' from ' . ($spec['min'] ?? 0) . ' to ' . ($spec['max'] ?? '') . (isset($spec['unit']) ? ' ' . $spec['unit'] : ''); + continue 2; + } + $value = assetSpecNumber($number); + break; + case 'date': + $date = DateTime::createFromFormat('!Y-m-d', $value); + if (!$date || $date->format('Y-m-d') !== $value) { + $problems[] = $spec['label'] . ': a date'; + continue 2; + } + break; + case 'select': + $match = ''; + foreach ($spec['options'] as $option) { + if (strcasecmp($option, $value) === 0) { + $match = $option; + } + } + if ($match === '') { + $problems[] = $spec['label'] . ': one of ' . implode(', ', $spec['options']); + continue 2; + } + $value = $match; + break; + case 'asset': + // By id, or by name - as an import or the export has it + $types = "'" . implode("', '", array_map('escapeSql', $spec['asset_types'])) . "'"; + $pick = ctype_digit($value) ? intval($value) : 0; + if (!$pick) { + $named = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT asset_id FROM assets WHERE asset_name = '" . escapeSql($value) . "' AND asset_client_id = " . intval($client_id) . " AND asset_type IN ($types) AND asset_archived_at IS NULL ORDER BY asset_id LIMIT 1")); + $pick = intval($named['asset_id'] ?? 0); + } + if (!$pick || $pick === intval($asset_id) || !mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM assets WHERE asset_id = $pick AND asset_client_id = " . intval($client_id) . " AND asset_type IN ($types) LIMIT 1"))) { + $problems[] = $spec['label'] . ': one of the client\'s ' . implode(' or ', array_map(function ($type) { + return strtoupper($type) === $type ? $type : strtolower($type) . 's'; + }, $spec['asset_types'])); + continue 2; + } + $value = (string) $pick; + break; + default: + $value = mb_substr(preg_replace('/[\x00-\x1F\x7F]+/u', ' ', $value), 0, 255); + } + $kept[$key] = $value; + } + return $kept; +} + +/** + * Keep an asset's details - what its type has, as given; the rest go (a + * detail its type no longer has, or one emptied). What changed, in words. + */ +function assetSpecsSave($asset_id, $asset_type, array $specs) { + global $mysqli; + $asset_id = intval($asset_id); + if (!assetSpecsReady()) { + return []; + } + $before = assetSpecs($asset_id); + $allowed = array_keys(assetTypeSpecs($asset_type)); + $changes = []; + foreach ($before as $key => $value) { + if (!in_array($key, $allowed, true) || !array_key_exists($key, $specs)) { + mysqli_query($mysqli, "DELETE FROM asset_specs WHERE asset_spec_asset_id = $asset_id AND asset_spec_key = '" . escapeSql($key) . "'"); + if (in_array($key, $allowed, true)) { + $changes[] = (ASSET_SPECS[$key]['label'] ?? $key) . ' cleared'; + } + } + } + foreach ($specs as $key => $value) { + if (!in_array($key, $allowed, true) || ($before[$key] ?? null) === (string) $value) { + continue; + } + mysqli_query($mysqli, "INSERT INTO asset_specs SET asset_spec_asset_id = $asset_id, asset_spec_key = '" . escapeSql($key) . "', asset_spec_value = '" . escapeSql($value) . "' + ON DUPLICATE KEY UPDATE asset_spec_value = VALUES(asset_spec_value)"); + $changes[] = ASSET_SPECS[$key]['label'] . ' ' . assetSpecText($key, $value, ['link' => false]); + } + return $changes; +} + +/** + * An asset's ports from its details - the interfaces its ports and SFP ports + * count that it doesn't have yet are made (interfacePortsEnsure()). How many, + * by kind - copper and sfp. + */ +function assetPortsFromSpecs($asset_id, $asset_type, array $specs) { + $type_specs = assetTypeSpecs($asset_type); + if (!isset($type_specs['ports']) && !isset($type_specs['sfp_ports'])) { + return ['copper' => 0, 'sfp' => 0]; + } + return interfacePortsEnsure($asset_id, $asset_type, intval($specs['ports'] ?? 0), intval($specs['sfp_ports'] ?? 0)); +} + +/** "23 ports and 4 SFP ports" - what assetPortsFromSpecs() made, or ''. */ +function assetPortsMadeText(array $made) { + $parts = []; + if ($made['copper']) { + $parts[] = $made['copper'] . ' port' . ($made['copper'] === 1 ? '' : 's'); + } + if ($made['sfp']) { + $parts[] = $made['sfp'] . ' SFP port' . ($made['sfp'] === 1 ? '' : 's'); + } + return implode(' and ', $parts); +} + +/** + * The asset form's details (spec[key]) for an asset just saved: checked, + * kept, and its ports made from their counts - when a count is new or + * changed, so an edit of something else doesn't put back a port someone + * took off. [what to add to the message - ", with 23 ports added" or '', + * the values not kept and why]. + */ +function assetSpecsFromPost($asset_id, $asset_type, $input, $client_id) { + $asset_type = assetTypeName($asset_type) ?: trim((string) $asset_type); + $before = assetSpecs($asset_id); + $specs = assetSpecsFromInput($asset_type, $input, $client_id, $asset_id, $problems); + assetSpecsSave($asset_id, $asset_type, $specs); + $made = ''; + if (($before['ports'] ?? '') !== ($specs['ports'] ?? '') || ($before['sfp_ports'] ?? '') !== ($specs['sfp_ports'] ?? '')) { + $made = assetPortsMadeText(assetPortsFromSpecs($asset_id, $asset_type, $specs)); + } + return [$made !== '' ? ", with $made added" : '', $problems]; +} + +/** + * A detail as it reads - "16 GB", "Wi-Fi 6 (802.11ax)", a date. A host is its + * name ($opts['hosts'] => [id => name] saves a lookup each; $opts['link'] + * false gives plain text, the default HTML is escaped either way). Raw text. + */ +function assetSpecText($key, $value, array $opts = []) { + $spec = ASSET_SPECS[$key] ?? ['input' => 'text']; + $value = (string) $value; + if ($value === '') { + return ''; + } + switch ($spec['input']) { + case 'number': + return assetSpecNumber($value) . (isset($spec['unit']) ? ' ' . $spec['unit'] : ''); + case 'asset': + $hosts = $opts['hosts'] ?? null; + $name = $hosts !== null ? ($hosts[intval($value)] ?? '') : (string) getFieldById('assets', intval($value), 'asset_name'); + return $name !== '' ? $name : 'An asset that is gone'; + default: + return $value; + } +} + +/** + * The details a page shows for an asset - [key => [label, icon, text, html, + * flag]] in its type's order, the ones with a value. html is ready to echo: a + * host links to its page (the same client's only), a flagged date carries its + * badge as assetWarranty() reads it. Ports read "24 + 4 SFP". + */ +function assetSpecRows($asset_type, array $specs, $client_id = 0) { + $rows = []; + $type_specs = assetTypeSpecs($asset_type); + foreach ($type_specs as $key => $spec) { + $value = (string) ($specs[$key] ?? ''); + if ($value === '' || ($key === 'sfp_ports' && isset($type_specs['ports']) && ($specs['ports'] ?? '') !== '')) { + continue; + } + $text = assetSpecText($key, $value); + $html = escapeHtml($text); + $flag = null; + if ($key === 'ports' && ($specs['sfp_ports'] ?? '') !== '') { + $text = assetSpecNumber($value) . ' + ' . assetSpecNumber($specs['sfp_ports']) . ' SFP'; + $html = escapeHtml($text); + } elseif ($spec['input'] === 'asset') { + $host_id = intval($value); + $host = $host_id ? mysqli_fetch_assoc(mysqli_query($GLOBALS['mysqli'], "SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $host_id LIMIT 1")) : null; + if (!$host || ($client_id && intval($host['asset_client_id']) !== intval($client_id))) { + continue; + } + $text = $host['asset_name']; + $html = '' . escapeHtml($text) . ''; + } elseif (!empty($spec['flag'])) { + $flag = assetWarranty($value); + if ($flag) { + $flag['short'] = $flag['tone'] === 'success' ? 'Good' : ($flag['tone'] === 'danger' ? 'Overdue' : $flag['short']); + $flag['text'] = $flag['tone'] === 'danger' ? 'Due ' . timeAgo($flag['date']) : ($flag['tone'] === 'warning' ? ($flag['days'] === 0 ? 'Due today' : 'Due in ' . $flag['days'] . ' day' . ($flag['days'] === 1 ? '' : 's')) : 'By ' . $flag['date']); + } + } elseif (!empty($spec['mono'])) { + $html = '' . $html . ''; + } + // The short line - the list's Details, the quick look: the label, unless the value says what it is, and no age + $label = $spec['label']; + $alone = !empty($spec['alone']) || stripos($text, $label) === 0; + $brief = ($alone ? '' : '' . escapeHtml($label) . ' ') . $html; + if ($spec['input'] === 'date' && !$flag && !in_array($age = assetAge($value), ['', 'new'], true)) { + $html .= '
' . escapeHtml($age) . ' ago
'; + } + $rows[$key] = ['label' => $label, 'icon' => $spec['icon'], 'text' => $text, 'html' => $html, 'flag' => $flag, 'alone' => $alone, 'brief' => $brief]; + } + return $rows; +} + +/** The assets a detail can pick (a VM's host) - the client's own of its types, bar this one: [id => name]. */ +function assetSpecAssetOptions($key, $client_id, $asset_id = 0, $keep_id = 0) { + global $mysqli; + $spec = ASSET_SPECS[$key] ?? null; + if (!$spec || $spec['input'] !== 'asset' || !$client_id) { + return []; + } + $types = "'" . implode("', '", array_map('escapeSql', $spec['asset_types'])) . "'"; + $options = []; + $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_type FROM assets WHERE asset_client_id = " . intval($client_id) . " AND asset_type IN ($types) + AND asset_id <> " . intval($asset_id) . " AND (asset_archived_at IS NULL OR asset_id = " . intval($keep_id) . ") ORDER BY asset_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $options[intval($row['asset_id'])] = $row; + } + return $options; +} + +/** The virtual machines that run on an asset (their Host) - the same client's, not archived: [id => name]. */ +function assetGuests($asset_id, $client_id) { + global $mysqli; + $guests = []; + if (!assetSpecsReady()) { + return $guests; + } + $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name FROM asset_specs JOIN assets ON asset_id = asset_spec_asset_id + WHERE asset_spec_key = 'vm_host' AND asset_spec_value = '" . intval($asset_id) . "' AND asset_client_id = " . intval($client_id) . " + AND asset_type = 'Virtual Machine' AND asset_archived_at IS NULL ORDER BY asset_name ASC"); + while ($sql && $row = mysqli_fetch_assoc($sql)) { + $guests[intval($row['asset_id'])] = $row['asset_name']; + } + return $guests; +} + +/** + * Rows for an export, each with its details as spec_ - its type's, as + * written in the form (a host by its name); '' for the rest. + */ +function assetSpecsExportAttach(array $rows) { + global $mysqli; + $specs = assetSpecsFor(array_column($rows, 'asset_id')); + $hosts = []; + foreach ($specs as $asset_specs) { + if (!empty($asset_specs['vm_host'])) { + $hosts[intval($asset_specs['vm_host'])] = ''; + } + } + if ($hosts) { + $sql = mysqli_query($mysqli, "SELECT asset_id, asset_name FROM assets WHERE asset_id IN (" . implode(',', array_keys($hosts)) . ")"); + while ($row = mysqli_fetch_assoc($sql)) { + $hosts[intval($row['asset_id'])] = $row['asset_name']; + } + } + foreach ($rows as $i => $row) { + $type_specs = assetTypeSpecs($row['asset_type'] ?? ''); + foreach (array_keys(ASSET_SPECS) as $key) { + $value = isset($type_specs[$key]) ? (string) ($specs[intval($row['asset_id'] ?? 0)][$key] ?? '') : ''; + $rows[$i]['spec_' . $key] = $key === 'vm_host' && $value !== '' ? ($hosts[intval($value)] ?? '') : $value; + } + } + return $rows; +} + +/** The API's assets, each with its details as asset_specs - {key: value}, its type's only. */ +function assetSpecsApiAttach(array $rows) { + $specs = assetSpecsFor(array_column($rows, 'asset_id')); + foreach ($rows as $i => $row) { + $kept = array_intersect_key($specs[intval($row['asset_id'] ?? 0)] ?? [], assetTypeSpecs($row['asset_type'] ?? '')); + $rows[$i]['asset_specs'] = (object) $kept; + } + return $rows; +} diff --git a/functions/client_export.php b/functions/client_export.php index abc205775..30c33b5fd 100644 --- a/functions/client_export.php +++ b/functions/client_export.php @@ -1293,11 +1293,13 @@ function clientExportPdf($client_id, $options) { $assets = $has('assets') ? $data('assets') : []; if ($assets) { $chapter('Assets', $count(count($assets), 'asset') . ' in use', 0, true); + // By the type's group (ASSET_TYPES, functions/asset_type.php) $families = [ - 'Servers' => ['Server', 'Virtual Machine'], - 'Network equipment' => ['Firewall/Router', 'Switch', 'Access Point'], - 'Workstations' => ['Desktop', 'Laptop'], - 'Phones and mobile devices' => ['Phone', 'Mobile Phone', 'Tablet'], + 'Servers and storage' => assetTypesInGroup('server', 'virtual'), + 'Network equipment' => assetTypesInGroup('network'), + 'Power' => assetTypesInGroup('power'), + 'Workstations' => assetTypesInGroup('workstation'), + 'Phones and mobile devices' => assetTypesInGroup('mobile'), ]; $placed = []; foreach ($families as $family => $types) { diff --git a/functions/client_overview.php b/functions/client_overview.php index 1b08145b6..23c4790e1 100644 --- a/functions/client_overview.php +++ b/functions/client_overview.php @@ -500,10 +500,10 @@ function clientOverviewAssets($client_id) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(asset_id) AS total, - COALESCE(SUM(asset_type IN ('Desktop', 'Laptop')), 0) AS workstation, - COALESCE(SUM(asset_type = 'Server'), 0) AS server, - COALESCE(SUM(asset_type = 'Virtual Machine'), 0) AS virtual, - COALESCE(SUM(asset_type IN ('Firewall/Router', 'Switch', 'Access Point')), 0) AS network, + COALESCE(SUM(" . assetTypeGroupSql('workstation') . "), 0) AS workstation, + COALESCE(SUM(" . assetTypeGroupSql('server') . "), 0) AS server, + COALESCE(SUM(" . assetTypeGroupSql('virtual') . "), 0) AS virtual, + COALESCE(SUM(" . assetTypeGroupSql('network') . "), 0) AS network, COALESCE(SUM(asset_warranty_expire IS NOT NULL AND asset_warranty_expire < CURRENT_DATE), 0) AS warranty_expired, COALESCE(SUM(asset_warranty_expire IS NOT NULL AND asset_warranty_expire >= CURRENT_DATE), 0) AS warranty_active FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL")); diff --git a/functions/document_template.php b/functions/document_template.php index 1b506cc55..717f02d49 100644 --- a/functions/document_template.php +++ b/functions/document_template.php @@ -531,11 +531,11 @@ function documentTemplateTableData($table, $client_id) { case 'assets': return $assets([], ['name', 'type', 'model', 'serial', 'site', 'who']); case 'servers': - return $assets(['Server', 'Virtual Machine'], ['name', 'type', 'os', 'ip', 'site']); + return $assets(assetTypesInGroup('server', 'virtual'), ['name', 'type', 'os', 'ip', 'site']); case 'workstations': - return $assets(['Desktop', 'Laptop'], ['name', 'type', 'model', 'serial', 'who']); + return $assets(assetTypesInGroup('workstation'), ['name', 'type', 'model', 'serial', 'who']); case 'network equipment': - return $assets(['Firewall/Router', 'Switch', 'Access Point'], ['name', 'type', 'model', 'ip', 'site']); + return $assets(assetTypesInGroup('network'), ['name', 'type', 'model', 'ip', 'site']); case 'printers': return $assets(['Printer'], ['name', 'model', 'ip', 'site']); case 'networks': diff --git a/functions/export.php b/functions/export.php index dfd2e01c5..101cfabfc 100644 --- a/functions/export.php +++ b/functions/export.php @@ -506,6 +506,13 @@ function getExportColumns($export_type) { ]; + // An asset's details, a column each - off until picked (ASSET_SPECS, functions/asset_type.php) + if ($export_type === 'assets' && defined('ASSET_SPECS')) { + foreach (ASSET_SPECS as $spec_key => $spec) { + $registry['assets']['spec_' . $spec_key] = ['label' => $spec['label'] . (isset($spec['unit']) ? ' (' . $spec['unit'] . ')' : ''), 'default' => false]; + } + } + return $registry[$export_type] ?? []; } diff --git a/functions/notifications.php b/functions/notifications.php index 5d4c76b24..db3d7b9ad 100644 --- a/functions/notifications.php +++ b/functions/notifications.php @@ -32,7 +32,7 @@ function notificationTypeModules() { 'module_financial' => ['Expense', 'Expense Created'], 'module_support' => [ 'Ticket', 'Ticket SLA', 'Pending Tickets', 'Feedback', 'Recurring Ticket', 'Project', - 'Domain Expiring', 'Certificate Expiring', 'Asset Warranty Expiring', 'Service Review', + 'Domain Expiring', 'Certificate Expiring', 'Asset Warranty Expiring', 'UPS Battery Due', 'Service Review', // Shared links - they open Shared Links (agent/shares.php), which is Support's 'Shared link opened', 'Shared link locked', 'Login sent back', 'Share Viewed', ], @@ -71,6 +71,7 @@ function notificationTypeStyle($type) { [['accepted'], 'check-circle', 'success'], [['overdue', 'late charge'], 'exclamation-triangle', 'warning'], [['expiring'], 'hourglass-half', 'warning'], + [['battery'], 'car-battery', 'warning'], [['stock'], 'boxes', 'warning'], [['viewed'], 'eye', 'info'], [['quote'], 'comment-dollar', 'primary'], diff --git a/functions/products.php b/functions/products.php index a589da2c5..2b09a4376 100644 --- a/functions/products.php +++ b/functions/products.php @@ -602,10 +602,9 @@ function productStockQty($qty) { * units are recorded. */ -/** Asset types => icon class (fa-laptop) - the list in load_global_settings.php. */ +/** Asset types => icon class (fa-laptop) - ASSET_TYPES (functions/asset_type.php). */ function productAssetTypes() { - global $asset_types_array; - return is_array($asset_types_array ?? null) ? $asset_types_array : []; + return assetTypeIcons(); } /** An asset type as the list spells it, matched without case - '' when it isn't one. */ diff --git a/functions/rack.php b/functions/rack.php index 2eb4ac6a0..bb2ba146d 100644 --- a/functions/rack.php +++ b/functions/rack.php @@ -37,9 +37,13 @@ function rackItemStyle($asset_type, $unit_type, $has_asset) { $tones = [ 'Server' => 'server', 'Virtual Machine' => 'server', + 'NAS' => 'server', 'Switch' => 'network', 'Access Point' => 'network', + 'Modem/ONT' => 'network', 'Firewall/Router' => 'firewall', + 'UPS' => 'power', + 'PDU' => 'power', ]; $asset_type = (string) $asset_type; return [ diff --git a/includes/load_global_settings.php b/includes/load_global_settings.php index 2b8efbe02..6a49e0a60 100644 --- a/includes/load_global_settings.php +++ b/includes/load_global_settings.php @@ -207,19 +207,5 @@ $records_per_page_array = array ('5','10','15','20','30','50','100'); include_once "settings_localization_array.php"; -$asset_types_array = array ( - 'Laptop'=>'fa-laptop', - 'Desktop'=>'fa-desktop', - 'Server'=>'fa-server', - 'Phone'=>'fa-phone', - 'Mobile Phone'=>'fa-mobile-alt', - 'Tablet'=>'fa-tablet-alt', - 'Firewall/Router'=>'fa-fire-alt', - 'Switch'=>'fa-network-wired', - 'Access Point'=>'fa-wifi', - 'Printer'=>'fa-print', - 'Display'=>'fa-tv', - 'Camera'=>'fa-video', - 'Virtual Machine'=>'fa-cloud', - 'Other'=>'fa-tag' -); +// Type => icon - the asset types, in order (ASSET_TYPES in functions/asset_type.php) +$asset_types_array = function_exists('assetTypeIcons') ? assetTypeIcons() : [];