summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/varios
diff options
context:
space:
mode:
authorIrina Gómez <irinagomez@us.es>2018-11-12 11:23:07 +0100
committerIrina Gómez <irinagomez@us.es>2018-11-12 11:23:07 +0100
commit8296e89d159d0bfa2ff3bfef9a9ba31a5c05589a (patch)
treeca2a81098daf656896c49826388581584a475aee /admin/WebConsole/varios
parent52a1490abc5bebe5acd8294539701e0a864dacf5 (diff)
#849 Incorporar ordenadores: se eliminan comentarios al final de línea antes de incluir los equipos en el aula.
Diffstat (limited to 'admin/WebConsole/varios')
-rw-r--r--admin/WebConsole/varios/incorporaordenadores.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/WebConsole/varios/incorporaordenadores.php b/admin/WebConsole/varios/incorporaordenadores.php
index ec303ea0..2615fbad 100644
--- a/admin/WebConsole/varios/incorporaordenadores.php
+++ b/admin/WebConsole/varios/incorporaordenadores.php
@@ -108,6 +108,8 @@ function procesaLineas($cmd,$idaula,$buffer)
$MAC="";
$IP="";
$sw=false;
+ // Eliminamos comentarios a final de línea
+ $buffer = preg_replace(array("/\#.*\r\n/", "/\#.*\r/", "/\#.*\n/"), "", $buffer."\n");
$equipos = preg_split('/}/',$buffer);