summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/rest/remotepc.php
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2017-05-24 09:07:44 +0000
committerramon <ramongomez@us.es>2017-05-24 09:07:44 +0000
commit35a63b6d5d634b601225410c1454804fef9e2be0 (patch)
treebfac49b936f60516b910eed1f39052de0c743b6d /admin/WebConsole/rest/remotepc.php
parenta16ce1b27a94d59876aafc2a865278b0ae288723 (diff)
#708: Refinar consultas SQL en rutas de inicio y fin de reserva.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5314 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/rest/remotepc.php')
-rw-r--r--admin/WebConsole/rest/remotepc.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/WebConsole/rest/remotepc.php b/admin/WebConsole/rest/remotepc.php
index ee65eb1d..4121fb4e 100644
--- a/admin/WebConsole/rest/remotepc.php
+++ b/admin/WebConsole/rest/remotepc.php
@@ -70,7 +70,7 @@ SELECT adm.idadministradorcentro, entornos.ipserveradm, entornos.portserveradm,
WHERE adm.idadministradorcentro = '$userid'
AND aulas.idcentro = '$ouid' AND aulas.idaula LIKE '$labid' AND aulas.inremotepc = 1
AND imagenes.idimagen = '$imageid' AND imagenes.inremotepc = 1
- AND remotepc.reserved < NOW()
+ AND (remotepc.reserved < NOW() OR ISNULL(reserved))
ORDER BY remotepc.reserved ASC LIMIT 1;
EOD;
$rs=new Recordset;
@@ -332,8 +332,7 @@ EOD;
$cmd->texto = <<<EOD
DELETE FROM acciones
WHERE idordenador = '$clntid'
- AND descriaccion = 'RemotePC Session'
- AND estado = $ACCION_INICIADA;
+ AND descriaccion = 'RemotePC Session';
EOD;
$cmd->Ejecutar();
$cmd->texto = "COMMIT;";