summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/principal
diff options
context:
space:
mode:
authorIrina Gómez <irinagomez@us.es>2019-05-13 10:14:38 +0200
committerIrina Gómez <irinagomez@us.es>2019-05-13 10:14:38 +0200
commit04b15943a1c2000616da87528418cd96f28e70ff (patch)
tree746224bbaecbd4701a81ddbc4970f01d2b17f957 /admin/WebConsole/principal
parentb845aabe00bd8f91093c654aacee96407897d26c (diff)
parentfec3e4f55169609aa6a13b9f29272113fe9ffa0c (diff)
Merge branch 'devel' into uefi (fast-forward)
Diffstat (limited to 'admin/WebConsole/principal')
-rw-r--r--admin/WebConsole/principal/actualizar.php2
-rw-r--r--admin/WebConsole/principal/colasacciones.php16
-rw-r--r--admin/WebConsole/principal/configuraciones.php2
-rw-r--r--admin/WebConsole/principal/ecoconsola.php2
-rw-r--r--admin/WebConsole/principal/manual.php3
-rw-r--r--admin/WebConsole/principal/purgar.php2
-rw-r--r--admin/WebConsole/principal/repositorios.php14
-rw-r--r--admin/WebConsole/principal/shellconsola.php2
-rw-r--r--admin/WebConsole/principal/sondeo.php2
9 files changed, 22 insertions, 23 deletions
diff --git a/admin/WebConsole/principal/actualizar.php b/admin/WebConsole/principal/actualizar.php
index a67e3585..63f2d1b3 100644
--- a/admin/WebConsole/principal/actualizar.php
+++ b/admin/WebConsole/principal/actualizar.php
@@ -59,5 +59,5 @@
}
else
echo "0"; // Error de conexión
-?>
+
diff --git a/admin/WebConsole/principal/colasacciones.php b/admin/WebConsole/principal/colasacciones.php
index 1c6558d7..ad927564 100644
--- a/admin/WebConsole/principal/colasacciones.php
+++ b/admin/WebConsole/principal/colasacciones.php
@@ -141,8 +141,8 @@
//________________________________________________________________________________________________________
?>
<HTML>
- <TITLE>Administración web de aulas</TITLE>
<HEAD>
+ <TITLE>Administración web de aulas</TITLE>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<LINK rel="stylesheet" type="text/css" href="../estilos.css">
<SCRIPT language="javascript" src="../clases/jscripts/MenuContextual.js"></SCRIPT>
@@ -175,8 +175,8 @@
$HTMLCriterios="";
$HTMLCriterios.='<TABLE class=tabla_busquedas align=center border="0">'; // Filtro de búsquedas
- $HTMLCriterios.=' <TR HEIGHT=30>';
- $HTMLCriterios.=' <TD style=" BORDER-BOTTOM:#5a86b5 1px solid;"colspan=2 align="center" >';
+ $HTMLCriterios.=' <TR>';
+ $HTMLCriterios.=' <TD HEIGHT="30px" style="BORDER-BOTTOM:#5a86b5 1px solid;" colspan=2 align="center">';
$HTMLCriterios.=' <SPAN style="FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif;
FONT-SIZE: 11px;COLOR:#5a86b5;FONT-WEIGHT: 700;">____ '.$TbMsg[1].'____</SPAN></TD></TR>';
@@ -861,11 +861,10 @@ function escribeResumen($oA)
{
global $cmd;
global $TbMsg;
-
global $ACCION_EXITOSA;
global $ACCION_FALLIDA;
- global $ACCION_SINRESULTADO;
-
+ global $ACCION_SINRESULTADO;
+ global $ACCION_DETENIDA;
global $EJECUCION_TAREA;
$html="";
@@ -1198,9 +1197,7 @@ function ContextualXMLComun()
global $EJECUCION_TAREA;
global $sesion;
- $layerXML="";
-
- $layerXML.='<ITEM';
+ $layerXML ='<ITEM';
$layerXML.=' alpulsar="eleccion(1,document.facciones.localaccion)"';
$layerXML.=' imgitem="../images/iconos/eliminar.gif"';
$layerXML.=' textoitem='.$TbMsg[46];
@@ -1244,5 +1241,4 @@ function ContextualXMLComun()
$layerXML.='</MENUCONTEXTUAL>';
return($layerXML);
}
-?>
diff --git a/admin/WebConsole/principal/configuraciones.php b/admin/WebConsole/principal/configuraciones.php
index 7c6e02aa..39093914 100644
--- a/admin/WebConsole/principal/configuraciones.php
+++ b/admin/WebConsole/principal/configuraciones.php
@@ -280,7 +280,7 @@ function datosGruposOrdenadores($cmd,$idgrupo)
}
$rs->Cerrar();
}
- if ($numordenadores==0)
+ if ($ordenadores==0)
{
$cmd->texto="SELECT *, COUNT(*) AS numordenadores
FROM gruposordenadores
diff --git a/admin/WebConsole/principal/ecoconsola.php b/admin/WebConsole/principal/ecoconsola.php
index cdd09205..5832e8e9 100644
--- a/admin/WebConsole/principal/ecoconsola.php
+++ b/admin/WebConsole/principal/ecoconsola.php
@@ -78,4 +78,4 @@
}
-?>
+
diff --git a/admin/WebConsole/principal/manual.php b/admin/WebConsole/principal/manual.php
index ce9885cc..85921d75 100644
--- a/admin/WebConsole/principal/manual.php
+++ b/admin/WebConsole/principal/manual.php
@@ -37,7 +37,8 @@ foreach ($fichero as $ficheros) {
</head>
<body class='acercade'>
-<div><p align=center class=cabeceras><img border=0 nod="aulas-1" value="Sala Virtual" style="cursor:pointer" src="../images/iconos/aula.gif" >&nbsp;&nbsp;<?php echo $TbMsg["MANUAL"] ?><br>
+<p align=center class=cabeceras><img border=0 style="cursor: pointer;" src="../images/iconos/aula.gif" >&nbsp;&nbsp;<?php echo $TbMsg["MANUAL"] ?></p>
+<br>
<table width='100%' border='0'>
<tr>
diff --git a/admin/WebConsole/principal/purgar.php b/admin/WebConsole/principal/purgar.php
index d3d0aaaa..bc945ffd 100644
--- a/admin/WebConsole/principal/purgar.php
+++ b/admin/WebConsole/principal/purgar.php
@@ -59,5 +59,5 @@
}
else
echo "0"; // Error de conexión
-?>
+
diff --git a/admin/WebConsole/principal/repositorios.php b/admin/WebConsole/principal/repositorios.php
index e2144b7f..5b273ed4 100644
--- a/admin/WebConsole/principal/repositorios.php
+++ b/admin/WebConsole/principal/repositorios.php
@@ -34,8 +34,8 @@ $XMLcontextual=ContextualXMLComandos($LITAMBITO_CENTROS,$AMBITO_CENTROS);
//________________________________________________________________________________________________________
?>
<HTML>
-<TITLE>Administración web de aulas</TITLE>
<HEAD>
+ <TITLE>Administración web de aulas</TITLE>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<LINK rel="stylesheet" type="text/css" href="../estilos.css">
<SCRIPT language="javascript" src="../clases/jscripts/ArbolVistaXML.js"></SCRIPT>
@@ -70,7 +70,7 @@ echo $flotante->CreaMenuContextual($XMLcontextual);
$XMLcontextual=CreacontextualXMLRepositorio(); // Repositorio
echo $flotante->CreaMenuContextual($XMLcontextual);
?>
-</BODY OnContextMenu="return false;">
+</BODY>
</HTML>
<?php
// *************************************************************************************************************************************************
@@ -325,7 +325,8 @@ function ContextualXMLComandos($litambito,$ambito){
global $cmd;
global $TbMsg;
$maxlongdescri=0;
- $rs=new Recordset;
+ $descrip="";
+ $rs=new Recordset;
$cmd->texto="SELECT idcomando,descripcion,pagina,gestor,funcion
FROM comandos
WHERE activo=1 AND aplicambito & ".$ambito.">0
@@ -335,9 +336,10 @@ function ContextualXMLComandos($litambito,$ambito){
$layerXML="";
$rs->Primero();
while (!$rs->EOF){
- if (isset($TbMsg["COMMAND_".$rs->campos["funcion"]])) {$descrip=$TbMsg["COMMAND_".$rs->campos["funcion"]];}else{$descrip;}
- //$descrip=$TbMsg["COMMAND_".$rs->campos["funcion"]];
- if (empty ($descrip)) {
+ if (isset($TbMsg["COMMAND_".$rs->campos["funcion"]])) {
+ $descrip=$TbMsg["COMMAND_".$rs->campos["funcion"]];
+ }
+ if (empty($descrip)) {
$descrip=$rs->campos["funcion"];
}
$layerXML.='<ITEM';
diff --git a/admin/WebConsole/principal/shellconsola.php b/admin/WebConsole/principal/shellconsola.php
index 64c44f79..a37276f0 100644
--- a/admin/WebConsole/principal/shellconsola.php
+++ b/admin/WebConsole/principal/shellconsola.php
@@ -189,4 +189,4 @@ function RecorreOrdenadores($cmd){
}
$rs->Cerrar();
}
-?>
+
diff --git a/admin/WebConsole/principal/sondeo.php b/admin/WebConsole/principal/sondeo.php
index cc63ec60..ca3e8b5e 100644
--- a/admin/WebConsole/principal/sondeo.php
+++ b/admin/WebConsole/principal/sondeo.php
@@ -95,5 +95,5 @@
}
}
echo $trama_notificacion;
-?>
+