9 files changed, 18 insertions, 6 deletions

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
--- /dev/null
+++ b/admin/WebConsole/images/ordenador_WOL_SENT.png
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 '  </tr>';
 	echo '  <tr align="center" valign="top">';
-	foreach (Array ("OFF", "MNT") as $status) {
+	foreach (Array ("OFF", "MNT", "WOL_SENT") as $status) {
 		echo '    <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" style="opacity: '.(1-0.5*($status=="MNT")).'" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.str_replace(" ", "<br>", $TbMsg["STATUS_$status"]).'</font></td>';
 	}
 	echo '  </tr>';
diff --git a/admin/WebConsole/principal/configuraciones.php b/admin/WebConsole/principal/configuraciones.php
index 19ecff7d..fca880ab 100644
--- a/admin/WebConsole/principal/configuraciones.php
+++ b/admin/WebConsole/principal/configuraciones.php
@@ -356,7 +356,7 @@ function datos_sesiones($cmd, $idordenador)
     }
     if ($ip) {
         foreach (file(LOG_FILE) as $line) {
-            if (strstr($line, "ip=$ip")) {
+            if (strstr($line, "ip=$ip,")) {
                 $fields = preg_split("/[:,=]/", rtrim($line, ". \t\n\r\0\x0B"));
                 $date_time = str_replace("T", " ", $fields[0]) . ":" . $fields[1] . ":" .
                     preg_replace("/\+.*$/", "", $fields[2]);
diff --git a/admin/WebConsole/rest/remotepc.php b/admin/WebConsole/rest/remotepc.php
index 6a897e0a..6dc5a62d 100644
--- a/admin/WebConsole/rest/remotepc.php
+++ b/admin/WebConsole/rest/remotepc.php
@@ -185,6 +185,9 @@ INSERT INTO acciones
        idcentro=$ouid;
 EOD;
 		$t2 = $cmd->Ejecutar();
+		create_schedule_now(strval($timestamp),
+				    $EJECUCION_COMANDO,
+				    "auto-queue-remotepc-reserve-".$timestamp);
 		// Create event to remove reservation on timeout (15 min.).
 		$timeout = "15 MINUTE";
 		$cmd->texto = <<<EOD
@@ -679,6 +682,9 @@ INSERT INTO acciones
        idcentro=$ouid;
 EOD;
 		$cmd->Ejecutar();
+		create_schedule_now(strval($timestamp),
+				    $EJECUCION_COMANDO,
+				    "auto-queue-remotepc-init-".$timestamp);
 		// Create event to remove the operation on timeout (15 min.).
 		$timeout = "15 MINUTE";
 		$cmd->texto = <<<EOD
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);