diff --git a/CHANGELOG.md b/CHANGELOG.md index bd96c1a9b..94972ecab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -208,6 +208,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u - Dashboard and client overview: when the last row of Needs attention is short, its tiles keep their width rather than one stretching across, and a count of one reads 1 Draft invoice, not 1 Draft invoices. - Unbilled Time: the time logged is under the hours to bill rather than a column of its own, so the list fits beside Bill these clients. - Forms: the + beside a picker and the Cancel button look the same in every window, a vendor's What they are is Description as on other records, and a few notes under fields that only said where a value shows are gone. +- Starter Content and the demo data are in US spelling - license, authorized, organization, fiber and the like. Where you loaded them before, nothing is added twice: the Authorised Contacts Only vendor tag and the Licence assigned canned response you have count as loaded, and bringing the starter canned responses up to date gives the response its new name. Bringing the starter ticket templates up to date has New Hire Onboarding ask for the License. Loading the demo data again, or removing it, still finds what an earlier load made. ### Bug Fixes @@ -411,6 +412,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u - Weekly summary: database 4.0.7 adds `settings.config_weekly_summary`, `_day` (1 Monday to 7 Sunday), `_to` (NULL for every admin) and `_sent_at`. `functions/weekly_summary.php`: `weeklySummaryReady()`, `weeklySummarySettings()`, `weeklySummaryRecipients()`, `weeklySummaryNumbers($from, $to)`, `weeklySummaryNeeds()`, `weeklySummaryEmail($until)`, `weeklySummarySend()` and `weeklySummaryRun()`, called by `cron/nightly_tasks.php`, which sends once on the day (`config_weekly_summary_sent_at`). `send_weekly_summary_now` in `admin/post/settings_notification.php`; the `weekly_summary` email preview. - Related tickets: database 4.0.8 adds `ticket_links` (`ticket_id` as the primary key, `link_group`, `linked_by`, `linked_at`; deleted with its ticket). `functions/ticket_link.php`: `ticketLinksReady()`, `ticketLinkGroup()`, `ticketLinkMembers()`, `ticketLinkTogether()` (any number of tickets and everything already related to them into one group, with a ticket history line naming the newly related ones), `ticketUnlink()`, `ticketRelated()` and `ticketLinkCounts()` (scoped to the agent's clients), `ticketLinkHidden()`, `ticketLinkCandidates()` and `ticketLinkCarry()` (from `ticketMergeInto()`). A group is numbered by its lowest ticket id, renumbered by `ticketLinkTidy()` as tickets leave, so one number never names two groups; a group left with one ticket is deleted. `agent/post/ticket_link.php` handles `link_tickets`, `unlink_ticket` and `bulk_link_tickets`; Reply to all and Resolve all open `ticket_bulk_reply.php` and `ticket_bulk_resolve.php` with `ticket_ids[]`. - Look and feel: `.itflow-dash-rail` is a grid (`repeat(auto-fill, minmax(10rem, 1fr))`, `.itflow-dash-rail-clear` spans it; `.itflow-ov-stats` stays flex), and the attention items of `dashboardAttention()` and `clientOverviewAttention()` take `one`, used when the count is 1. `formatAssignee()` highlights unassigned in warning, `ticketBillableHtml()` draws not billable in `bg-body-secondary`, and `ticketSlaState()` gives `breached` for an open ticket with a `ticket_response_sla_met` or `ticket_resolution_sla_met` of 0 or a deadline in the past. `includes/filter_footer.php` links the first, last and neighboring pages with an ellipsis between, in place of every tenth page. The list pages render `tagPills()` only for a row with tags, and `agent/includes/inc_client_top_head.php` passes `$can_edit` false. `categoryAddButtonHtml()` and `quickAddButton()` are called with their default `btn-outline-secondary` everywhere. `js/app.js` focuses the dialog again on the next tick when AdminLTE's `shown.bs.modal` handler has put focus on its `.btn-close`. +- Starter content: `starterRenamed()` in `admin/post/starter_content_model.php` maps a starter item's old name, keyed as `starterExistingNames()` keys it, to its new one. Tags and canned responses here under the old name count as present (`starterExistingRenamed()`, `starterCannedResponseNames()`), `starterUpdateCannedResponses()` renames one before replacing it, and `demoAttachTags()` falls back to the old tag name. `demoDataRenamed()` holds the demo products' old name and description and the errand trip's old purpose; `demoProductId()` finds a demo product either way for load and removal, and a load renames an old one in place. ## [26.11.8] diff --git a/admin/post/demo_data_model.php b/admin/post/demo_data_model.php index 92d7337f4..070e5cc28 100644 --- a/admin/post/demo_data_model.php +++ b/admin/post/demo_data_model.php @@ -62,7 +62,7 @@ function demoDataOrgVendors() { ['Synology Direct', 'NAS hardware and Active Backup for Business licensing', '425-555-0139', 'synologydirect.example', 'Next business day replacement', 'SYN-2280'], ['Proxmox Server Solutions', 'Proxmox VE and Proxmox Backup Server subscriptions', '203-555-0101', 'proxmoxsubs.example', 'Enterprise repository access', 'PVE-5512'], ['Nextcloud Hosting Partner', 'Managed Nextcloud instances resold to clients', '203-555-0177', 'ncpartner.example', '4 hour response', 'NC-3390'], - ['Cascade Cloud Licensing', 'Microsoft and Google licensing through the partner programme', '877-555-0155', 'cascadelicensing.example', 'Partner support portal', 'CCL-6640'], + ['Cascade Cloud Licensing', 'Microsoft and Google licensing through the partner program', '877-555-0155', 'cascadelicensing.example', 'Partner support portal', 'CCL-6640'], ['Three Rivers Colocation', 'Rack space, power and transit for the management stack', '412-555-0128', 'threeriverscolo.example', '24/7 hands and eyes', 'TRC-1180'], ['Steelworks Business Bank', 'Business banking, merchant services and card settlement', '412-555-0100', 'steelworksbank.example', 'Business hours', 'SBB-0042'], ['Alcott and Reyes CPA', 'Bookkeeping, payroll filing and year end accounts', '412-555-0192', 'alcottreyes.example', 'Monthly close', 'ARC-2210'], @@ -161,8 +161,8 @@ function demoDataProducts() { ['Open Source Stack Review', 'service', 'FOSS-REV', '850.00', 'Consulting', 'Fixed fee. Review of a self hosted stack with a written report and a costed roadmap.', '', '0.00', '', '', 0], // Corporate licensing and hardware, resold - ['Google Workspace Business Standard', 'service', 'LIC-GWBS', '14.00', 'Managed Services', 'Per user, per month. Licence resold and managed.', 'month:contacts', '11.20', 'Cascade Cloud Licensing', 'GWS-BSTD-FLEX', 0], - ['Synology Active Backup Licence', 'product', 'LIC-SYNAB', '0.00', 'Hardware Sales', 'Included with Synology hardware. Listed so it appears on the quote.', '', '0.00', 'Synology Direct', '', 0], + ['Google Workspace Business Standard', 'service', 'LIC-GWBS', '14.00', 'Managed Services', 'Per user, per month. License resold and managed.', 'month:contacts', '11.20', 'Cascade Cloud Licensing', 'GWS-BSTD-FLEX', 0], + ['Synology Active Backup License', 'product', 'LIC-SYNAB', '0.00', 'Hardware Sales', 'Included with Synology hardware. Listed so it appears on the quote.', '', '0.00', 'Synology Direct', '', 0], ['Netgate 6100 MAX Firewall', 'product', 'HW-NG6100', '1245.00', 'Hardware Sales', 'pfSense Plus appliance with three years of support included.', '', '935.00', 'Netgate', '6100-MAX', 0, 'Firewall/Router', 'Netgate', '6100 MAX', 36], ['Ubiquiti U6-Pro Access Point', 'product', 'HW-U6PRO', '245.00', 'Hardware Sales', 'Wi-Fi 6 ceiling mounted access point, PoE powered.', '', '179.00', 'Ubiquiti Store', 'U6-Pro', 1, 'Access Point', 'Ubiquiti', 'U6-Pro', 12], ['Ubiquiti USW-Pro-24-PoE Switch', 'product', 'HW-USW24', '785.00', 'Hardware Sales', '24 port managed PoE switch with SFP+ uplinks.', '', '599.00', 'Ubiquiti Store', 'USW-Pro-24-PoE', 0, 'Switch', 'Ubiquiti', 'USW-Pro-24-PoE', 12], @@ -204,6 +204,47 @@ function demoProductExtras($product, $vendors) { return $extras; } +// ------------------------------ +// demoDataRenamed +// What this library wrote before it took US spelling (26.12), so a load and a +// removal still find what an earlier load made: catalogue lines by code => the +// name and description they had, and errand purposes now => the purpose then. +// ------------------------------ +function demoDataRenamed() { + return [ + 'products' => [ + 'LIC-GWBS' => ['Google Workspace Business Standard', 'Per user, per month. Licence resold and managed.'], + 'LIC-SYNAB' => ['Synology Active Backup Licence', 'Included with Synology hardware. Listed so it appears on the quote.'], + ], + 'errands' => ['Bank - deposit checks and cash' => 'Bank - deposit cheques and cash'], + ]; +} + +// ------------------------------ +// demoProductId +// The install's line for one of demoDataProducts() - code, name and description +// all have to match, as now or as they were (demoDataRenamed()). The Products +// starter pack ships its own catalogue and an install may well sell the same +// thing under the same code, so nothing weaker is safe at removal time. Edit +// the description and we leave our line behind rather than risk taking theirs - +// the harmless direction to fail in. [product_id or 0, whether it is the old one] +// ------------------------------ +function demoProductId($mysqli, $product) { + $versions = [[$product[0], $product[5]]]; + $old = demoDataRenamed()['products'][$product[2]] ?? null; + if ($old) { + $versions[] = $old; + } + foreach ($versions as $n => $version) { + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT product_id FROM products WHERE product_code = '" . escapeSql($product[2]) . "' + AND product_name = '" . escapeSql($version[0]) . "' AND product_description = '" . escapeSql($version[1]) . "' LIMIT 1")); + if (!empty($row['product_id'])) { + return [intval($row['product_id']), $n > 0]; + } + } + return [0, false]; +} + // ------------------------------ // demoEnsureProducts // Matched on the product code, which is what makes a catalogue line ours - a @@ -214,17 +255,13 @@ function demoEnsureProducts($mysqli, $currency, $vendors = []) { $products = []; foreach (demoDataProducts() as $product) { - $code = escapeSql($product[2]); - $name = escapeSql($product[0]); - $description = escapeSql($product[5]); - // Code, name and description all have to match. The Products starter - // pack ships its own catalogue and an install may well sell the same - // thing under the same code, so nothing weaker is safe at removal time. - // Edit the description and we leave our line behind rather than risk - // taking theirs - the harmless direction to fail in. - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT product_id FROM products WHERE product_code = '$code' AND product_name = '$name' AND product_description = '$description' LIMIT 1")); - if (!empty($row['product_id'])) { - $products[$product[0]] = intval($row['product_id']); + [$product_id, $was_old] = demoProductId($mysqli, $product); + if ($product_id) { + // One an earlier load made takes this version's spelling + if ($was_old) { + mysqli_query($mysqli, "UPDATE products SET product_name = '" . escapeSql($product[0]) . "', product_description = '" . escapeSql($product[5]) . "' WHERE product_id = $product_id"); + } + $products[$product[0]] = $product_id; continue; } $products[$product[0]] = starterInsert($mysqli, 'products', [ @@ -449,8 +486,17 @@ function demoMacAddress($seed) { // ------------------------------ function demoAttachTags($mysqli, $join_table, $join_column, $tag_column, $row_id, $tag_type, $tag_names) { foreach ($tag_names as $tag_name) { - $tag_name = escapeSql($tag_name); - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT tag_id FROM tags WHERE tag_name = '$tag_name' AND tag_type = $tag_type LIMIT 1")); + // A starter tag loaded under the name it had (starterRenamed()) is the same tag + $names = [$tag_name]; + foreach (starterRenamed('tags') as $old => $new) { + if (strpos($old, intval($tag_type) . '|') === 0 && mb_strtolower($new) === mb_strtolower($tag_name)) { + $names[] = substr($old, strpos($old, '|') + 1); + } + } + $names_sql = implode(', ', array_map(function ($name) { + return "'" . escapeSql($name) . "'"; + }, $names)); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT tag_id FROM tags WHERE tag_name IN ($names_sql) AND tag_type = $tag_type ORDER BY tag_name = '" . escapeSql($tag_name) . "' DESC LIMIT 1")); $tag_id = intval($row['tag_id'] ?? 0); if ($tag_id) { mysqli_query($mysqli, "INSERT INTO $join_table SET $join_column = $row_id, $tag_column = $tag_id"); @@ -490,8 +536,8 @@ function demoVendorTags($name, $description, $notes = '', $ours = false) { if (!$tags) { $tags[] = 'Line of Business'; } - if (stripos($notes, 'authorised list') !== false) { - $tags[] = 'Authorised Contacts Only'; + if (stripos($notes, 'authorized list') !== false) { + $tags[] = 'Authorized Contacts Only'; } return $tags; } @@ -587,7 +633,7 @@ function demoEnsureOrgVendors($mysqli) { 'vendor_sla' => $vendor[4], 'vendor_code' => $vendor[5], 'vendor_account_number' => $vendor[5], - 'vendor_notes' => 'Organisation supplier. Purchase orders are raised against this account and reconciled at month end.', + 'vendor_notes' => 'Organization supplier. Purchase orders are raised against this account and reconciled at month end.', 'vendor_client_id' => 0, 'vendor_created_at' => demoMonthDateTime(24, 2, 9, 0), ]); @@ -1043,11 +1089,7 @@ function demoDataRemove($mysqli) { // Catalogue lines and calendars, matched the same conservative way - the // product code has to be ours, and a calendar only goes when it is empty foreach (demoDataProducts() as $product) { - $code = escapeSql($product[2]); - $name = escapeSql($product[0]); - $description = escapeSql($product[5]); - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT product_id FROM products WHERE product_code = '$code' AND product_name = '$name' AND product_description = '$description' LIMIT 1")); - $product_id = intval($row['product_id'] ?? 0); + $product_id = demoProductId($mysqli, $product)[0]; if (!$product_id) { continue; } @@ -1086,9 +1128,13 @@ function demoDataRemove($mysqli) { // Our own unbilled running around, matched on the exact purposes we wrote. // Anything else with no client against it belongs to whoever logged it. foreach (demoDataErrands() as $errand) { - $purpose = escapeSql($errand[0]); $destination = escapeSql($errand[1]); - mysqli_query($mysqli, "DELETE FROM trips WHERE trip_client_id = 0 AND trip_source = 'Office' AND trip_purpose = '$purpose' AND trip_destination = '$destination'"); + // As it is written now, and as an earlier load wrote it (demoDataRenamed()) + $purposes = array_unique([$errand[0], demoDataRenamed()['errands'][$errand[0]] ?? $errand[0]]); + foreach ($purposes as $purpose) { + $purpose = escapeSql($purpose); + mysqli_query($mysqli, "DELETE FROM trips WHERE trip_client_id = 0 AND trip_source = 'Office' AND trip_purpose = '$purpose' AND trip_destination = '$destination'"); + } } // The statements reconciled on our accounts go with the demo - their lines @@ -1403,7 +1449,7 @@ function demoBuildClient($mysqli, $profile, $index, $context, &$counts) { 'domain_auto_renew' => $domain_auto_renew, 'domain_ip' => '203.0.113.' . (10 + $index), 'domain_name_servers' => 'ns1.' . $profile['dns_host'] . "\nns2." . $profile['dns_host'], - 'domain_raw_whois' => "Registrar: Harbour Registrar Services\nRegistered: " . demoDate(365 * (6 + $index % 9) + $index * 11) . "\nExpires: " . demoDate(-1 * (60 + ($index * 21))) . "\nStatus: client transfer prohibited\nNameservers: ns1." . $profile['dns_host'] . ', ns2.' . $profile['dns_host'], + 'domain_raw_whois' => "Registrar: Harbor Registrar Services\nRegistered: " . demoDate(365 * (6 + $index % 9) + $index * 11) . "\nExpires: " . demoDate(-1 * (60 + ($index * 21))) . "\nStatus: client transfer prohibited\nNameservers: ns1." . $profile['dns_host'] . ', ns2.' . $profile['dns_host'], 'domain_mail_servers' => '0 ' . $profile['mail_servers'], 'domain_dmarc' => [0 => 'v=DMARC1; p=reject; rua=mailto:dmarc@' . $profile['domain'], 1 => 'v=DMARC1; p=none; rua=mailto:dmarc@' . $profile['domain'], 2 => ''][$index % 3], 'domain_dkim' => $index % 4 === 3 ? '' : ($domain_m365 ? "selector1\nselector2" : 'google'), @@ -1436,7 +1482,7 @@ function demoBuildClient($mysqli, $profile, $index, $context, &$counts) { 'domain_name_servers' => 'ns1.' . $profile['dns_host'] . "\nns2." . $profile['dns_host'], 'domain_txt' => 'v=spf1 -all', 'domain_dmarc' => 'v=DMARC1; p=reject', - 'domain_raw_whois' => "Registrar: Harbour Registrar Services\nRegistered: " . demoDate(365 * 3 + $index) . "\nStatus: client transfer prohibited", + 'domain_raw_whois' => "Registrar: Harbor Registrar Services\nRegistered: " . demoDate(365 * 3 + $index) . "\nStatus: client transfer prohibited", 'domain_notes' => 'Ask the client whether to keep it before it renews.', 'domain_registrar' => $primary_vendor_id, 'domain_dnshost' => intval($primary_vendor_id), @@ -2322,7 +2368,7 @@ function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$cou 'project_prefix' => $prefix, 'project_number' => demoNextNumber($mysqli, 'config_project_next_number'), 'project_name' => 'Onboarding - ' . $profile['name'], - 'project_description' => 'Take on ' . $profile['name'] . ': document the environment, deploy monitoring and backup, capture credentials, standardise the endpoint build and hand over to the service desk.', + 'project_description' => 'Take on ' . $profile['name'] . ': document the environment, deploy monitoring and backup, capture credentials, standardize the endpoint build and hand over to the service desk.', 'project_start' => demoMonthDate($months, 3), 'project_due' => demoMonthDate(max(0, $months - 1), 28), 'project_budget_hours' => 16 + ($index % 3) * 8, @@ -3448,7 +3494,7 @@ function demoBuildCompanyFinancials($mysqli, $context, &$counts) { ['Team lunch', 96.00, 'Meals', 1, 17, 'Monongahela Property Group'], ['Mobile phones and data for the team', 268.00, 'Telecom and Internet', 1, 8, 'Three Rivers Colocation'], ['Professional body dues and subscriptions', 210.00, 'Dues and Subscriptions', 3, 20, 'Alcott and Reyes CPA'], - ['Van servicing and tyres', 480.00, 'Vehicle and Fuel', 6, 13, 'Ridgeline Technology Distribution'], + ['Van servicing and tires', 480.00, 'Vehicle and Fuel', 6, 13, 'Ridgeline Technology Distribution'], ['Replacement bench laptop and monitors', 1650.00, 'Equipment', 12, 16, 'Ridgeline Technology Distribution'], ['Subcontract cabling work', 1250.00, 'Contractor', 4, 25, 'Ridgeline Technology Distribution'], ['Courier and shipping', 88.00, 'Shipping and Postage', 1, 27, 'Ridgeline Technology Distribution'], @@ -3791,7 +3837,7 @@ function demoDataBudgets() { // ------------------------------ function demoDataErrands() { return [ - ['Bank - deposit cheques and cash', 'Steelworks Business Bank, Pittsburgh, PA', 6.4, 2, 3], + ['Bank - deposit checks and cash', 'Steelworks Business Bank, Pittsburgh, PA', 6.4, 2, 3], ['Distributor - parts collection', 'Ridgeline Technology Distribution, Pittsburgh, PA', 14.2, 3, 1], ['Colocation - hands on at the rack', 'Three Rivers Colocation, Pittsburgh, PA', 11.8, 4, 4], ['Post office - warranty returns', 'Post Office, Pittsburgh, PA', 3.1, 2, 5], @@ -4074,7 +4120,7 @@ function demoAssetDescription($asset_type) { 'Firewall/Router' => 'Edge firewall - site to site VPN, DNS filtering and inter VLAN rules', 'Switch' => 'Access layer switch - PoE for handsets and access points', 'Access Point' => 'Ceiling mounted wireless access point', - 'Server' => 'Virtualisation host and file storage', + 'Server' => 'Virtualization host and file storage', 'Virtual Machine' => 'Virtual guest', 'Desktop' => 'Standard staff workstation', 'Laptop' => 'Mobile staff laptop', @@ -4258,7 +4304,7 @@ function demoTicketPool() { 'replies' => [ ['Public', '
Machine is built to the standard image, mailbox is licensed, and group memberships match the department template. Credentials handed over on their first morning.
', '01:30:00'], ], - 'tasks' => ['Build workstation to standard', 'Create mailbox and assign licence', 'Apply department group memberships', 'Handover on day one'], + 'tasks' => ['Build workstation to standard', 'Create mailbox and assign license', 'Apply department group memberships', 'Handover on day one'], ], [ 'subject' => 'Suspicious invoice email reported by staff', @@ -4320,9 +4366,9 @@ function demoTicketPool() { 'asset_types' => ['Laptop', 'Desktop'], 'details' => 'Leaving at the end of the week. Mailbox needs delegating to their manager and the laptop collecting.
', 'replies' => [ - ['Public', 'Account disabled at close of business, mailbox converted and delegated, licence reclaimed, and the machine wiped and returned to spare stock.
', '01:15:00'], + ['Public', 'Account disabled at close of business, mailbox converted and delegated, license reclaimed, and the machine wiped and returned to spare stock.
', '01:15:00'], ], - 'tasks' => ['Disable account', 'Delegate mailbox', 'Reclaim licence', 'Collect and wipe machine'], + 'tasks' => ['Disable account', 'Delegate mailbox', 'Reclaim license', 'Collect and wipe machine'], ], [ 'subject' => 'Phones not ringing at the front desk', @@ -4492,7 +4538,7 @@ function demoOneOffInvoicePool() { ['Build and Seed', 10, 145.00, 'Build, seed the first full backup and verify a restore', 0], ], 'project'], ['Proxmox host build and migration', [ - ['Virtualisation Host', 1, 4650.00, 'Dual socket host with NVMe storage for Proxmox VE', 1], + ['Virtualization Host', 1, 4650.00, 'Dual socket host with NVMe storage for Proxmox VE', 1], ['Migration Labor', 16, 145.00, 'Guest migration, cutover and post migration support', 0], ['Out of Hours Cutover', 6, 195.00, 'Cutover work outside operating hours', 0], ], 'project'], @@ -4529,7 +4575,7 @@ function demoDataSpecs() { 'recurring_ticket' => 'Monthly maintenance visit - Ravenwood Dental', 'project' => ['Imaging server replacement', 'Replace the end of life imaging server and migrate the patient imaging database with no clinic downtime.'], 'vendors' => [ - ['Keystone Business Fiber', 'Primary internet circuit and failover', '412-555-0140', 'keystonefiber.example', '4 hour response', 'Circuit ID is recorded in the site runbook. Support will not talk to anyone not on the authorised list.'], + ['Keystone Business Fiber', 'Primary internet circuit and failover', '412-555-0140', 'keystonefiber.example', '4 hour response', 'Circuit ID is recorded in the site runbook. Support will not talk to anyone not on the authorized list.'], ['Meridian Dental Systems', 'Patient records and imaging platform', '412-555-0145', 'meridiandental.example', '8x5 support', 'Vendor manages the application, we manage the box it runs on.'], ], 'fleet' => ['Firewall/Router' => 1, 'Switch' => 2, 'Access Point' => 4, 'Server' => 2, 'Desktop' => 14, 'Laptop' => 3, 'Printer' => 3, 'Phone' => 8], @@ -4557,7 +4603,7 @@ function demoDataSpecs() { 'recurring_ticket' => 'Monthly maintenance visit - Kestrel Precision', 'project' => ['Plant Two network rebuild', 'Replace the unmanaged switching in Plant Two, add VLAN separation for shop floor equipment and extend wireless to the yard.'], 'vendors' => [ - ['Lakeshore Telecom', 'Fibre circuits for both plants', '814-555-0175', 'lakeshoretelecom.example', 'Next business day', 'Two circuits, one per plant, on separate accounts. Both account numbers are in the runbook.'], + ['Lakeshore Telecom', 'Fiber circuits for both plants', '814-555-0175', 'lakeshoretelecom.example', 'Next business day', 'Two circuits, one per plant, on separate accounts. Both account numbers are in the runbook.'], ['Foundry ERP Systems', 'Production and scheduling platform', '814-555-0178', 'foundryerp.example', '8x5 support', 'They push server side updates without warning. Ask for release notes.'], ], 'fleet' => ['Firewall/Router' => 2, 'Switch' => 6, 'Access Point' => 8, 'Server' => 3, 'Virtual Machine' => 4, 'Desktop' => 22, 'Laptop' => 9, 'Printer' => 4, 'Phone' => 14, 'Camera' => 6], @@ -4607,10 +4653,10 @@ function demoDataSpecs() { 'tags' => ['Managed', 'Compliance', 'Cyber Insurance', 'After Hours Support', 'Multi Site', 'Key Account'], 'notes' => 'Regulated environment. Change control paperwork is required before anything touches the core banking network.', 'account_note' => 'Annual examination in the autumn - documentation and restore evidence must be current before then.', - 'review_note' => 'Examiners asked for firewall rule documentation last year. Standardisation project is meant to close that off.', + 'review_note' => 'Examiners asked for firewall rule documentation last year. Standardization project is meant to close that off.', 'onsite_visit' => 'Branch equipment and compliance check', 'recurring_ticket' => 'Monthly maintenance visit - Harbor Point CU', - 'project' => ['Branch firewall standardisation', 'Bring both branches onto the same firewall platform with central logging and documented rule sets for the examination.'], + 'project' => ['Branch firewall standardization', 'Bring both branches onto the same firewall platform with central logging and documented rule sets for the examination.'], 'vendors' => [ ['Northcoast Data Services', 'Core banking platform hosting', '216-555-0122', 'northcoastdata.example', '24/7 with 1 hour response', 'Change control forms go through them 5 working days ahead.'], ['Cuyahoga Business Fiber', 'Branch circuits and failover', '216-555-0125', 'cuyahogafiber.example', '4 hour response', 'Both branches, separate accounts, both with 4G failover.'], @@ -4719,7 +4765,7 @@ function demoDataSpecs() { 'review_note' => 'Nextcloud went in during onboarding to replace a consumer file sync account. Staff have taken to it well.', 'onsite_visit' => 'Onboarding discovery visit', 'recurring_ticket' => 'Monthly maintenance visit - Aurora Wellness', - 'project' => ['Documentation and standardisation', 'Finish discovery, document the environment, standardise endpoint protection and get backups verified.'], + 'project' => ['Documentation and standardization', 'Finish discovery, document the environment, standardize endpoint protection and get backups verified.'], 'vendors' => [ ['Mountaineer Connect', 'Internet and managed wifi', '304-555-0133', 'mountaineerconnect.example', '4 hour response', 'They installed the original wireless. We have taken over the controller.'], ], @@ -4824,7 +4870,7 @@ function demoDataSpecs() { 'mail_platform' => 'Microsoft 365', 'cert_issuer' => 'DigiCert', 'tags' => ['Managed', 'Compliance', 'Cyber Insurance', 'Key Account'], 'notes' => 'Carrier portals drive everything. Browser and certificate problems are most of the ticket volume.', - 'account_note' => 'They sell cyber cover themselves, so their own posture gets scrutinised. Keep the evidence current.', + 'account_note' => 'They sell cyber cover themselves, so their own posture gets scrutinized. Keep the evidence current.', 'review_note' => 'Passed their own carrier audit last quarter with no findings. Worth repeating the same evidence pack.', 'onsite_visit' => 'Office equipment and carrier portal check', 'recurring_ticket' => 'Monthly maintenance visit - Verity Insurance', @@ -4858,7 +4904,7 @@ function demoDataSpecs() { 'recurring_ticket' => 'Monthly maintenance visit - Ironbridge Architects', 'project' => ['Drawing archive storage expansion', 'Expand the storage pool and restructure the drawing archive so the older projects move to slower storage without breaking links.'], 'vendors' => [ - ['South Side Fibre', 'Studio internet - symmetric line for large uploads', '412-555-0193', 'southsidefibre.example', '4 hour response', 'Symmetric line chosen for upload speed. Do not let anyone downgrade it.'], + ['South Side Fiber', 'Studio internet - symmetric line for large uploads', '412-555-0193', 'southsidefibre.example', '4 hour response', 'Symmetric line chosen for upload speed. Do not let anyone downgrade it.'], ], 'fleet' => ['Firewall/Router' => 1, 'Switch' => 2, 'Access Point' => 3, 'Server' => 2, 'Virtual Machine' => 3, 'Desktop' => 12, 'Laptop' => 5, 'Printer' => 2, 'Phone' => 8], 'people' => [ @@ -4906,14 +4952,14 @@ function demoDataSpecs() { 'lead' => 0, 'favorite' => 0, 'tax' => '', 'tax_exempt' => ['75-0031906', '-20 days'], 'mail_platform' => 'Google Workspace', 'cert_issuer' => "Let's Encrypt", 'tags' => ['Co-Managed', 'Managed', 'Non Profit', 'Seasonal', 'Compliance'], - 'notes' => 'Runs on open source deliberately - budget goes on staff, not licences. Quiet in July, chaotic in late August.', + 'notes' => 'Runs on open source deliberately - budget goes on staff, not licenses. Quiet in July, chaotic in late August.', 'account_note' => 'Everything big happens in the summer break. Nothing disruptive during term time, ever.', 'review_note' => 'Linux desktop rollout finished last summer and cut the refresh budget substantially. Same again for the labs next year.', 'onsite_visit' => 'Classroom and lab equipment check', 'recurring_ticket' => 'Monthly maintenance visit - Summit Ridge Charter', 'project' => ['Computer lab refresh', 'Rebuild both computer labs on the standard Linux image over the summer break, including the imaging server and the lab management tooling.'], 'vendors' => [ - ['Monroeville Municipal Fibre', 'School district connection', '412-555-0136', 'monroevillefibre.example', '4 hour response', 'Filtered connection required by policy. Filtering is theirs, not ours.'], + ['Monroeville Municipal Fiber', 'School district connection', '412-555-0136', 'monroevillefibre.example', '4 hour response', 'Filtered connection required by policy. Filtering is theirs, not ours.'], ['Cornerstone Student Records', 'Student information system', '412-555-0137', 'cornerstonesis.example', '8x5 support', 'Hosted by the vendor. We hold administrative access only.'], ], 'fleet' => ['Firewall/Router' => 1, 'Switch' => 5, 'Access Point' => 10, 'Server' => 2, 'Virtual Machine' => 4, 'Desktop' => 28, 'Laptop' => 12, 'Printer' => 5, 'Tablet' => 10, 'Camera' => 6], @@ -4984,7 +5030,7 @@ function demoDataSpecs() { 'city' => 'New Castle', 'state' => 'PA', 'zip' => '16101', 'area' => '724', 'street' => '900 Industrial Boulevard', 'second_site' => null, 'age_days' => 1400, 'seats' => 24, 'servers' => 2, 'build' => 1, 'billing' => 'managed', - 'balance' => 'past_due', 'hosting' => [['Virtual Server Hosting', 2, 55.00, 'Two hosted guests for the file server and the licence server', 0], ['Offsite Backup Storage - Self Hosted', 1500, 0.09, 'Offsite backup for the machine programs, per GB', 0]], + 'balance' => 'past_due', 'hosting' => [['Virtual Server Hosting', 2, 55.00, 'Two hosted guests for the file server and the license server', 0], ['Offsite Backup Storage - Self Hosted', 1500, 0.09, 'Offsite backup for the machine programs, per GB', 0]], 'lead' => 0, 'favorite' => 0, 'tax' => 'PA Sales Tax', 'mail_platform' => 'Microsoft 365', 'cert_issuer' => 'DigiCert', 'tags' => ['Managed', 'After Hours Support', 'Past Due', 'At Risk'], @@ -4995,7 +5041,7 @@ function demoDataSpecs() { 'recurring_ticket' => 'Monthly maintenance visit - Corbin Machine Works', 'project' => null, 'vendors' => [ - ['Lawrence County Fibre', 'Shop internet', '724-555-0171', 'lawrencefibre.example', 'Next business day', 'Reliable line. Support desk is small but good.'], + ['Lawrence County Fiber', 'Shop internet', '724-555-0171', 'lawrencefibre.example', 'Next business day', 'Reliable line. Support desk is small but good.'], ['Precision Controls Group', 'CNC controller support', '724-555-0172', 'precisioncontrols.example', '8x5 support', 'They will not certify anything newer. Isolation is the mitigation.'], ], 'fleet' => ['Firewall/Router' => 1, 'Switch' => 4, 'Access Point' => 4, 'Server' => 2, 'Virtual Machine' => 3, 'Desktop' => 18, 'Laptop' => 4, 'Printer' => 3, 'Phone' => 10, 'Camera' => 4], @@ -5149,7 +5195,7 @@ function demoExpandProfile($spec) { : ['Managed Backup', 'Image level backup of ' . max(1, $servers) . ' servers with offsite copy', 'Backup', 'High', 'Offsite replication', 'Nightly job with a monthly test restore. Evidence is filed against the client documentation.', ['Server', 'Virtual Machine'], 'Backup Console']; $services = [ - [$mail, 'Company mail, calendars and identity for ' . $seats . ' users', 'Email', 'High', 'Third party mailbox backup', 'Tenant administered by us. Licence count is reconciled against the monthly invoice.', ['Virtual Machine'], $mail . ' Administrator'], + [$mail, 'Company mail, calendars and identity for ' . $seats . ' users', 'Email', 'High', 'Third party mailbox backup', 'Tenant administered by us. License count is reconciled against the monthly invoice.', ['Virtual Machine'], $mail . ' Administrator'], $backup_service, ['Edge Firewall and Site VPN', 'Perimeter filtering, DNS filtering and the site to site tunnel', 'Network', 'High', 'Nightly config export', 'Config backup is pulled nightly. Rule changes go through a ticket, never verbally.', ['Firewall/Router'], 'Firewall Administrator'], ['Endpoint Protection and Monitoring', 'Agent based protection and monitoring across the fleet', 'Security', 'High', 'Vendor cloud console', 'Alerts raise tickets automatically. Patch compliance is reviewed at the maintenance visit.', ['Desktop', 'Laptop', 'Server'], 'Network Controller'], @@ -5174,7 +5220,7 @@ function demoExpandProfile($spec) { // Software - the last two entries say which asset types it is installed on // and which credential administers it $software = [ - [$mail === 'Google Workspace' ? 'Google Workspace Business Standard' : 'Microsoft 365 Business Premium', 'Per user licensing resold and managed', 'Current', 'Software as a Service (SaaS)', 'Subscription', $seats, 'Licence count is reviewed monthly against staff numbers.', ['Desktop', 'Laptop'], $mail . ' Administrator'], + [$mail === 'Google Workspace' ? 'Google Workspace Business Standard' : 'Microsoft 365 Business Premium', 'Per user licensing resold and managed', 'Current', 'Software as a Service (SaaS)', 'Subscription', $seats, 'License count is reviewed monthly against staff numbers.', ['Desktop', 'Laptop'], $mail . ' Administrator'], ['Endpoint Protection', 'Managed endpoint protection agent', 'Current', 'Security Software', 'Subscription', $seats + max(1, $servers), 'Covers workstations, laptops and servers.', ['Desktop', 'Laptop', 'Server'], 'Network Controller'], ]; if ($foss) { @@ -5182,7 +5228,7 @@ function demoExpandProfile($spec) { $software[] = ['Nextcloud', 'Self hosted file sync and share', '30', 'Web Application', 'Open Source', $seats, 'Runs in a container on the hypervisor. Updates are applied at the maintenance visit.', ['Virtual Machine'], 'Hypervisor and Storage Administrator']; $software[] = ['Proxmox Backup Server', 'Backup target for the virtual guests', '3.3', 'System Software', 'Subscription', max(1, $servers), 'Community repository on site, enterprise subscription on the management stack.', ['Server'], 'Backup Console']; } else { - $software[] = ['Synology Active Backup for Business', 'Server, endpoint and mailbox backup', 'Current', 'System Software', 'Perpetual', $seats + max(1, $servers), 'Licence is included with the NAS. Agent is deployed to every endpoint.', ['Server', 'Desktop', 'Laptop'], 'Backup Console']; + $software[] = ['Synology Active Backup for Business', 'Server, endpoint and mailbox backup', 'Current', 'System Software', 'Perpetual', $seats + max(1, $servers), 'License is included with the NAS. Agent is deployed to every endpoint.', ['Server', 'Desktop', 'Laptop'], 'Backup Console']; } $software[] = [$spec['vendors'][count($spec['vendors']) - 1][0] . ' Platform', $spec['vendors'][count($spec['vendors']) - 1][1], 'Vendor managed', 'Web Application', 'Subscription', $seats, 'Vendor supported - we hold the administrative access only.', ['Desktop'], '']; @@ -5220,7 +5266,7 @@ function demoExpandProfile($spec) { . '' . $vendor[0] . ' - ' . $vendor[1] . '. Response target: ' . $vendor[4] . '.
'; }, $spec['vendors'])) - . 'Spend and downtime are approved by the authorised approver on the contact list. Do not take verbal approval from anyone else for work that will be billed.
', + . 'Spend and downtime are approved by the authorized approver on the contact list. Do not take verbal approval from anyone else for work that will be billed.
', 0, ], [ @@ -5228,7 +5274,7 @@ function demoExpandProfile($spec) { 'Client facing - how to raise a ticket and what to expect', 'Email the service desk or use the portal. Include what you were doing, what happened, and the name of the machine if you know it.
' . 'You will get an acknowledgement with a ticket number. Urgent issues are picked up first, and anything site wide is treated as urgent by default.
' - . 'Work that will be billed outside the agreement is quoted first and needs approval from an authorised approver before we start.
', + . 'Work that will be billed outside the agreement is quoted first and needs approval from an authorized approver before we start.
', 1, ], ]; @@ -5252,7 +5298,7 @@ function demoExpandProfile($spec) { } $agreement[] = [ $mail === 'Google Workspace' ? 'Google Workspace Business Standard' : 'Microsoft 365 Business Premium', - $seats, 22.00, 'Per user licence, resold and managed', 0, + $seats, 22.00, 'Per user license, resold and managed', 0, ]; $agreement[] = ['Cloud Backup', max(1, $servers), 65.00, 'Offsite backup with monthly test restore', 0]; } @@ -5323,7 +5369,7 @@ function demoExpandProfile($spec) { 'mail_platform' => $mail, 'mail_servers' => $mail === 'Google Workspace' ? 'aspmx.l.google.example' : $domain . '.mail.protection.example', 'web_host' => $foss ? 'Self hosted - Nextcloud and website on the hypervisor' : 'Vendor hosted', - 'dns_host' => 'harbourdns.example', + 'dns_host' => 'harbordns.example', 'cert_issuer' => $spec['cert_issuer'], 'credentials' => $credentials, 'services' => $services, diff --git a/admin/post/starter_content_model.php b/admin/post/starter_content_model.php index 94d9412a4..d713735d1 100644 --- a/admin/post/starter_content_model.php +++ b/admin/post/starter_content_model.php @@ -137,6 +137,45 @@ function starterExistingNames($mysqli, $table, $name_column, $key_column = null) return $existing; } +// ------------------------------ +// starterRenamed / starterExistingRenamed +// Starter items whose name has changed - to US spelling, in 26.12 - as the key +// starterExistingNames() gives the old name => the name now. An install that +// loaded one under its old name has it: it isn't added again under the new +// one, and bringing the pack up to date renames it. +// ------------------------------ +function starterRenamed($pack) { + $renamed = [ + 'tags' => ['6|authorised contacts only' => 'Authorized Contacts Only'], + 'canned_responses' => ['licence assigned' => 'License assigned'], + ]; + return $renamed[$pack] ?? []; +} + +function starterExistingRenamed($pack, array $existing) { + foreach (starterRenamed($pack) as $old => $new) { + if (isset($existing[$old])) { + $type = strpos($old, '|') !== false ? substr($old, 0, strpos($old, '|') + 1) : ''; + $existing[$type . mb_strtolower($new)] = true; + } + } + return $existing; +} + +// ------------------------------ +// starterCannedResponseNames +// The shared canned responses here, by lower cased name - and the new name of +// a starter one kept under its old one (starterRenamed()). +// ------------------------------ +function starterCannedResponseNames($mysqli) { + $existing = []; + $sql = mysqli_query($mysqli, "SELECT canned_response_name FROM canned_responses WHERE canned_response_user_id = 0"); + while ($row = mysqli_fetch_row($sql)) { + $existing[mb_strtolower($row[0])] = true; + } + return starterExistingRenamed('canned_responses', $existing); +} + // ------------------------------ // starterCategoryId // ------------------------------ @@ -290,17 +329,13 @@ function starterContentItems($mysqli, $pack) { }; break; case 'tags': - $existing = starterExistingNames($mysqli, 'tags', 'tag_name', 'tag_type'); + $existing = starterExistingRenamed('tags', starterExistingNames($mysqli, 'tags', 'tag_name', 'tag_type')); $here = function ($row) use ($existing) { return isset($existing[$row[0] . '|' . mb_strtolower($row[1])]); }; break; case 'canned_responses': - $existing = []; - $sql = mysqli_query($mysqli, "SELECT canned_response_name FROM canned_responses WHERE canned_response_user_id = 0"); - while ($row = mysqli_fetch_row($sql)) { - $existing[mb_strtolower($row[0])] = true; - } + $existing = starterCannedResponseNames($mysqli); break; default: $tables = ['ticket_templates' => ['ticket_templates', 'ticket_template_name'], 'project_templates' => ['project_templates', 'project_template_name'], @@ -406,7 +441,7 @@ function starterLoadCategories($mysqli, $dry_run = false, $only = null) { // starterLoadTags // ------------------------------ function starterLoadTags($mysqli, $dry_run = false, $only = null) { - $existing = starterExistingNames($mysqli, 'tags', 'tag_name', 'tag_type'); + $existing = starterExistingRenamed('tags', starterExistingNames($mysqli, 'tags', 'tag_name', 'tag_type')); $added = 0; foreach (starterOnly('tags', starterContentTags(), $only) as $tag) { @@ -463,17 +498,15 @@ function starterUpdateTicketTemplates() { // ------------------------------ function starterLoadCannedResponses($mysqli, $dry_run = false, $only = null) { $responses = cannedResponsesImportRead(['format' => CANNED_RESPONSE_FILE_FORMAT, 'version' => CANNED_RESPONSE_FILE_VERSION, 'responses' => starterOnly('canned_responses', starterContentCannedResponses(), $only)]); + // Ones here already, under their name or the one they had (starterRenamed()), are left alone + $existing = starterCannedResponseNames($mysqli); + $responses = array_values(array_filter($responses, function ($response) use ($existing) { + return !isset($existing[mb_strtolower($response['name'])]); + })); if ($dry_run) { - $existing = []; - $sql = mysqli_query($mysqli, "SELECT canned_response_name FROM canned_responses WHERE canned_response_user_id = 0"); - while ($row = mysqli_fetch_row($sql)) { - $existing[mb_strtolower($row[0])] = true; - } - return count(array_filter($responses, function ($response) use ($existing) { - return !isset($existing[mb_strtolower($response['name'])]); - })); + return count($responses); } - return cannedResponsesImport($responses, 'skip')['added']; + return $responses ? cannedResponsesImport($responses, 'skip')['added'] : 0; } // ------------------------------ @@ -484,6 +517,17 @@ function starterLoadCannedResponses($mysqli, $dry_run = false, $only = null) { // Returns the import's counts (cannedResponsesImport()). // ------------------------------ function starterUpdateCannedResponses() { + global $mysqli; + + // One still under the name it had takes its new name first, so it is the one brought up to date + foreach (starterRenamed('canned_responses') as $old => $new) { + $new_sql = escapeSql(mb_strtolower($new)); + if (!mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM canned_responses WHERE canned_response_user_id = 0 AND LOWER(canned_response_name) = '$new_sql' LIMIT 1"))) { + mysqli_query($mysqli, "UPDATE canned_responses SET canned_response_name = '" . escapeSql($new) . "' + WHERE canned_response_user_id = 0 AND LOWER(canned_response_name) = '" . escapeSql($old) . "' ORDER BY canned_response_id LIMIT 1"); + } + } + $responses = cannedResponsesImportRead(['format' => CANNED_RESPONSE_FILE_FORMAT, 'version' => CANNED_RESPONSE_FILE_VERSION, 'responses' => starterContentCannedResponses()]); return cannedResponsesImport($responses, 'replace', true); } @@ -909,7 +953,7 @@ function starterContentTags() { [6, 'Printing', '#6c757d', 'print'], [6, 'Hosting', '#17a2b8', 'globe'], [6, 'Professional Services', '#343a40', 'briefcase'], - [6, 'Authorised Contacts Only', '#d81b60', 'user-lock'], + [6, 'Authorized Contacts Only', '#d81b60', 'user-lock'], // Domain [7, 'Primary', '#007bff', 'star'], @@ -1000,7 +1044,7 @@ function starterContentTicketTemplates() { 'name' => 'New Hire Onboarding', 'description' => 'Standard setup for a new employee joining a client', 'subject' => 'New hire onboarding - [Employee Name]', - 'details' => '[Employee Name] starts on [Start Date] as [Job Title], reporting to [Manager]. Mirror their access from [Copy Access From].
Do not create anything until an authorized contact has approved the request in writing.
', + 'details' => '[Employee Name] starts on [Start Date] as [Job Title], reporting to [Manager]. Mirror their access from [Copy Access From].
Do not create anything until an authorized contact has approved the request in writing.
', 'category' => $category('Onboarding'), 'priority' => 'Medium', 'tags' => [$tag('Onboarding')], @@ -1012,12 +1056,12 @@ function starterContentTicketTemplates() { $fill_in('Copy Access From', 'text', ['help' => 'Someone whose access to files, groups and applications they should match']), $fill_in('Needs a Computer', 'yesno', ['required' => true, 'help' => 'We order it, set it up and have it on their desk']), $fill_in('Needs a Phone Extension', 'yesno'), - $fill_in('Licence', 'list', ['options' => ['Business Basic', 'Business Standard', 'Business Premium', 'Exchange Online only'], 'client' => false]), + $fill_in('License', 'list', ['options' => ['Business Basic', 'Business Standard', 'Business Premium', 'Exchange Online only'], 'client' => false]), ], 'tasks' => [ $task('Confirm start date and written approval from an authorized contact', 15), $task('Create the directory account and set the initial password', 15), - $task('Assign the [Licence] licence', 10), + $task('Assign the [License] license', 10), $task('Create the mailbox, signature and alias', 20), $task('Add to security and distribution groups, matching [Copy Access From]', 15), $task('Configure file share and application permissions', 20), @@ -1364,15 +1408,15 @@ function starterContentTicketTemplates() { 'fill_ins' => [ $fill_in('Software', 'text', ['required' => true, 'help' => 'Its name, and the version if it matters']), $fill_in('Who It Is For', 'text', ['help' => 'Leave it blank if it is for you']), - $fill_in('Already Licensed', 'yesno', ['required' => true, 'help' => 'Do you have a licence or subscription for it already?']), + $fill_in('Already Licensed', 'yesno', ['required' => true, 'help' => 'Do you have a license or subscription for it already?']), $fill_in('What It Is For'), ], 'tasks' => [ $task('Check it is compatible and approved for the client', 10), - $task('Quote and order the licence', 15, ['Already Licensed', 'No']), + $task('Quote and order the license', 15, ['Already Licensed', 'No']), $task('Install and license [Software]', 30), $task('Verify it works with the user', 10), - $task('Record the licence and update the asset', 10), + $task('Record the license and update the asset', 10), ], 'portal' => ['title' => 'Install some software', 'description' => 'An application you need on your computer', 'icon' => 'cube', 'who' => 'everyone'], ], @@ -1475,8 +1519,8 @@ function starterContentCannedResponses() { $response('Account unlocked', 'Hi [First Name],
[Account] was locked after too many wrong passwords, and I have unlocked it - you can sign in again now.
If it locks again without you mistyping, let us know straight away, as someone else may be trying to sign in as you.
' . $signed, ['Account and Access'], 'email', 'Resolved', 5), - $response('Licence assigned', - 'Hi [First Name],
I have assigned a [Licence] licence to [Person]. It can take up to an hour for everything to appear - signing out and back in usually speeds it up.
' . $signed, + $response('License assigned', + 'Hi [First Name],
I have assigned a [License] license to [Person]. It can take up to an hour for everything to appear - signing out and back in usually speeds it up.
' . $signed, ['Microsoft 365'], 'email', 'Resolved', 10), // Security @@ -1551,7 +1595,7 @@ function starterContentProjectTemplates() { ], [ 'name' => 'Server Refresh', - 'description' => 'Replace ageing server hardware and migrate roles and data across.', + 'description' => 'Replace aging server hardware and migrate roles and data across.', 'ticket_templates' => ['Server Deployment', 'Backup Restore Test'], ], [ @@ -2123,7 +2167,7 @@ function starterContentLicenseTemplates() { $template('Microsoft 365 Business Basic', 'Web and mobile Office apps, Exchange mail, Teams and OneDrive', 'Productivity Suite', 'User', '1y', 'Microsoft', 'Microsoft 365 Business Basic', $m365_notes), $template('Microsoft 365 Business Standard', 'Desktop Office apps, Exchange mail, Teams and OneDrive', 'Productivity Suite', 'User', '1y', 'Microsoft', 'Microsoft 365 Business Standard', $m365_notes), $template('Microsoft 365 Business Premium', 'Business Standard with Intune, Entra ID P1 and Defender for Business', 'Productivity Suite', 'User', '1y', 'Microsoft', 'Microsoft 365 Business Premium', array_merge($m365_notes, [ - "Devices are enrolled in Intune - keep the enrolment, compliance and conditional access policies with the client's documentation.", + "Devices are enrolled in Intune - keep the enrollment, compliance and conditional access policies with the client's documentation.", ])), $template('Exchange Online (Plan 1)', 'A mailbox, without the Office apps - for staff who only need mail', 'Software as a Service (SaaS)', 'User', '1y', 'Microsoft', 'Microsoft 365 Exchange Online Plan 1', [ 'Assigned to users in the Microsoft 365 admin center, under Billing > Licenses. Shared mailboxes need no license until they pass their size limit or need an archive.',