pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMXX - Upgrade software update

Browse Source
This commit is contained in:
“VeLiTi”
2024-11-21 15:09:52 +01:00
parent 2da1046385
commit 6004394784
16 changed files with 159 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
assets/functions.php
View File

@@ -787,7 +787,7 @@ function getPartnerName($str){
//------------------------------------------
// overview Indicators
//------------------------------------------
function overviewIndicators($warranty, $service, $sw_version, $hw_version){
function overviewIndicators($warranty, $service, $sw_version, $sw_version_latest){
include dirname(__FILE__,2).'/settings/settings.php';
include dirname(__FILE__,2).'/settings/systemfirmware.php';
$indicator ='';
@@ -805,20 +805,18 @@ function overviewIndicators($warranty, $service, $sw_version, $hw_version){
}
//Firmware
if (isset($sw_version) && isset($hw_version)){
$sw_version = substr($sw_version, 0, strpos($sw_version, "."));
$firmware = ${'Firmwarename' . $hw_version} ?? '';
//Firmware upgrade required
if (!empty($firmware) && ($sw_version != $firmware)){
$indicator .= '<span class="dot" style="background-color: #eb8a0d;">F</span>';
} else {
$indicator .= '<span class="dot" style="background-color: #13b368;">F</span>';
}
} else {
$indicator .= '<span class="dot" style="background-color: #81848a">F</span>';
}
if (isset($sw_version_latest)){
if($sw_version_latest == 1){
$indicator .= '<span class="dot" style="background-color: #13b368;">F</span>';
} else {
if ($sw_version == ''){
$indicator .= '<span class="dot" style="background-color: #81848a">F</span>';
} else {
$indicator .= '<span class="dot" style="background-color: #eb8a0d;">F</span>';
}
}
}
return $indicator;
}
@@ -891,39 +889,36 @@ function serviceStatus($input){
// Check available firmware
//------------------------------------------
function availableFirmware($sw_version, $hw_version){
function availableFirmware($sw_version,$sw_version_latest){
//INCLUDE TRANSLATION FILE
if(isset($_SESSION['country_code'])){
$api_file_language = dirname(__FILE__,2).'/settings/translations/translations_'.strtoupper($_SESSION['country_code']).'.php';
if (file_exists($api_file_language)){
include $api_file_language; //Include the code
}
else {
include dirname(__FILE__,2).'/settings/translations/translations_US.php';
}
}
else {
include dirname(__FILE__,2).'/settings/translations/translations_US.php';
}
//SET DEFAULTS
if ((isset($sw_version) && $sw_version == '')){
$message ='<span class="status">Unknown</span>';
if (isset($sw_version) && isset($hw_version)){
include dirname(__FILE__,2).'/settings/systemfirmware.php';
include dirname(__FILE__,2).'/settings/settings.php';
//INCLUDE TRANSLATION FILE
if(isset($_SESSION['country_code'])){
$api_file_language = dirname(__FILE__,2).'/settings/translations/translations_'.strtoupper($_SESSION['country_code']).'.php';
if (file_exists($api_file_language)){
include $api_file_language; //Include the code
}
else {
include dirname(__FILE__,2).'/settings/translations/translations_US.php';
}
}
else {
include dirname(__FILE__,2).'/settings/translations/translations_US.php';
}
$sw_version = substr($sw_version, 0, strpos($sw_version, "."));
$firmware = ${'Firmwarename' . $hw_version} ?? '';
if (!empty($firmware) && ($sw_version != $firmware)){
$message = '<span class="status firmware_update">'.$firmware_update_text.'</span>';
} else {
}
else {
//CHECK IF LATEST
if($sw_version_latest == 1){
$message = '<span class="status firmware_recent">'.$firmware_recent_text.'</span>';
}
}
return $message;
} else {
$message = '<span class="status firmware_update">'.$firmware_update_text.'</span>';
}
}
return $message;
}
//------------------------------------------