From d4a20cbe01c3d5a9afd1902b880e46c3fc442b1d Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Thu, 29 Apr 2021 14:33:22 +0000 Subject: #1043 Add WOL_SENT state support Adds ogServer wol state, used to report WoL packet sending. This state can timeout (returning to off) or change to a new state after clients report a new one. --- admin/WebConsole/idiomas/php/cat/estados_cat.php | 4 ++-- admin/WebConsole/idiomas/php/eng/estados_eng.php | 2 ++ admin/WebConsole/idiomas/php/esp/estados_esp.php | 4 ++-- admin/WebConsole/images/ordenador_WOL_SENT.png | Bin 0 -> 8504 bytes admin/WebConsole/jscripts/aula.js | 3 +++ admin/WebConsole/principal/aula.php | 2 +- admin/WebConsole/rest/server.php | 1 + 7 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 admin/WebConsole/images/ordenador_WOL_SENT.png diff --git a/admin/WebConsole/idiomas/php/cat/estados_cat.php b/admin/WebConsole/idiomas/php/cat/estados_cat.php index dfedfa42..8c3fd1da 100644 --- a/admin/WebConsole/idiomas/php/cat/estados_cat.php +++ b/admin/WebConsole/idiomas/php/cat/estados_cat.php @@ -19,5 +19,5 @@ $TbMsg["STATUS_LNXS"]="Sessió GNU/Linux"; $TbMsg["STATUS_OSX"]="macOS"; $TbMsg["STATUS_WIN"]="Windows"; $TbMsg["STATUS_WINS"]="Sessió Windows"; - - +// Estats WoL +$TbMsg["STATUS_WOL_SENT"]="WoL enviat"; diff --git a/admin/WebConsole/idiomas/php/eng/estados_eng.php b/admin/WebConsole/idiomas/php/eng/estados_eng.php index c5f2ed7b..85af4c41 100644 --- a/admin/WebConsole/idiomas/php/eng/estados_eng.php +++ b/admin/WebConsole/idiomas/php/eng/estados_eng.php @@ -19,3 +19,5 @@ $TbMsg["STATUS_LNXS"]="GNU/Linux session"; $TbMsg["STATUS_OSX"]="MacOS"; $TbMsg["STATUS_WIN"]="Windows"; $TbMsg["STATUS_WINS"]="Windows session"; +// WoL states +$TbMsg["STATUS_WOL_SENT"]="WoL sent"; diff --git a/admin/WebConsole/idiomas/php/esp/estados_esp.php b/admin/WebConsole/idiomas/php/esp/estados_esp.php index b1fce40f..3b54cc90 100644 --- a/admin/WebConsole/idiomas/php/esp/estados_esp.php +++ b/admin/WebConsole/idiomas/php/esp/estados_esp.php @@ -19,5 +19,5 @@ $TbMsg["STATUS_LNXS"]="Sesión GNU/Linux"; $TbMsg["STATUS_OSX"]="macOS"; $TbMsg["STATUS_WIN"]="Windows"; $TbMsg["STATUS_WINS"]="Sesión Windows"; - - +// Estados WoL +$TbMsg["STATUS_WOL_SENT"]="WoL enviado"; diff --git a/admin/WebConsole/images/ordenador_WOL_SENT.png b/admin/WebConsole/images/ordenador_WOL_SENT.png new file mode 100644 index 00000000..d8bef72e Binary files /dev/null and b/admin/WebConsole/images/ordenador_WOL_SENT.png differ diff --git a/admin/WebConsole/jscripts/aula.js b/admin/WebConsole/jscripts/aula.js index ce87b6e2..fa119ecb 100644 --- a/admin/WebConsole/jscripts/aula.js +++ b/admin/WebConsole/jscripts/aula.js @@ -138,6 +138,9 @@ function soIMG(so) case 'VDI': MimgOrdenador="ordenador_VDI.png"; // Virtual break; + case 'WOL_SENT': + MimgOrdenador="ordenador_WOL_SENT.png"; // Wol enviado + break; default: MimgOrdenador="ordenador_OFF.png"; // Apagado break; diff --git a/admin/WebConsole/principal/aula.php b/admin/WebConsole/principal/aula.php index 447a5727..efc09178 100644 --- a/admin/WebConsole/principal/aula.php +++ b/admin/WebConsole/principal/aula.php @@ -363,7 +363,7 @@ function pintaordenadores(){ } echo ' '; echo ' '; - foreach (Array ("OFF", "MNT") as $status) { + foreach (Array ("OFF", "MNT", "WOL_SENT") as $status) { echo ' '.$status.'
'.str_replace(" ", "
", $TbMsg["STATUS_$status"]).''; } echo ' '; diff --git a/admin/WebConsole/rest/server.php b/admin/WebConsole/rest/server.php index a6256a2e..12b874ed 100644 --- a/admin/WebConsole/rest/server.php +++ b/admin/WebConsole/rest/server.php @@ -81,6 +81,7 @@ function getStatus($ouid, $labid, $clntid=0) { 'LNX'=>"linux", 'OSX'=>"macos", 'WIN'=>"windows", + 'WOL_SENT'=>"wol_sent", 'UNK'=>"unknown"]; // Parameters. $ouid = htmlspecialchars($ouid); -- cgit v1.2.3-18-g5258