Merge akamai:ZoneMinder into ai_server

connortechnology · connortechnology · commit 143a9b9ffcbf · 2026-03-12T18:01:30.000-04:00
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
@@ -945,7 +945,7 @@ function getCpuUsageHTML() {
     $thisServer->ReadStats();
 
     $result .= '<li id="getCpuUsageHTML" class="CpuUsage nav-item mx-2">'.PHP_EOL;
-    $result .= '&nbsp;'.translate('Cpu').': '.number_format($thisServer->CpuUsagePercent, 1, '.', '').'%'.PHP_EOL;
+    $result .= '&nbsp;'.translate('CPU').': '.number_format($thisServer->CpuUsagePercent, 1, '.', '').'%'.PHP_EOL;
     $result .= '</li>'.PHP_EOL;
   }
   return $result;

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ function getCpuUsageHTML() {`
`945`	`945`	`$thisServer->ReadStats();`
`946`	`946`
`947`	`947`	`$result .= '<li id="getCpuUsageHTML" class="CpuUsage nav-item mx-2">'.PHP_EOL;`
`948`		`- $result .= ' '.translate('Cpu').': '.number_format($thisServer->CpuUsagePercent, 1, '.', '').'%'.PHP_EOL;`
	`948`	`+ $result .= ' '.translate('CPU').': '.number_format($thisServer->CpuUsagePercent, 1, '.', '').'%'.PHP_EOL;`
`949`	`949`	`$result .= '</li>'.PHP_EOL;`
`950`	`950`	`}`
`951`	`951`	`return $result;`