diff options
| author | Irina Gómez <irinagomez@us.es> | 2018-11-12 11:23:07 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-11-13 10:52:45 +0100 |
| commit | 48921143528b6227fc1b3e46dadb5581f55b4108 (patch) | |
| tree | 62fe1669787370a577e56f6aa50755dfc3765e9c | |
| parent | 70865269f372bcc19cc212354cd2d3e6d3d2d66c (diff) | |
#849 Incorporar ordenadores: se eliminan comentarios al final de línea antes de incluir los equipos en el aula.
(cherry picked from commit 8296e89d159d0bfa2ff3bfef9a9ba31a5c05589a)
| -rw-r--r-- | admin/WebConsole/varios/incorporaordenadores.php | 2 |
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); |