#834: Check for more variable definitions and continue code cleanup.

17 files changed, 48 insertions, 51 deletions

diff --git a/admin/WebConsole/comandos/CrearSoftIncremental.php b/admin/WebConsole/comandos/CrearSoftIncremental.php
index 87c3cb69..55ab6f35 100644
--- a/admin/WebConsole/comandos/CrearSoftIncremental.php
+++ b/admin/WebConsole/comandos/CrearSoftIncremental.php
@@ -50,10 +50,10 @@ if (!$resul){
 <!------------------------------------------------------------------------------------------
  Cabecera 
 -------------------------------------------------------------------------------------------> 
-	<P align=center class=cabeceras><?php echo $TbMsg[0] ?><P>
+	<P align=center class=cabeceras><?php echo $TbMsg[0] ?></P>
 	<P align=center>
-	<SPAN align=center class=subcabeceras><?php echo $TbMsg[1] ?></SPAN>
-	</BR>
+	<SPAN class=subcabeceras><?php echo $TbMsg[1] ?></SPAN>
+	<BR>
 	<TABLE  align=center border=0 cellPadding=1 cellSpacing=1 class=tabla_datos>
 		<TR>
 			<TH align=center>&nbsp;<?php echo $TbMsg[2] ?>&nbsp;</TD>
@@ -73,7 +73,7 @@ if (!$resul){
 <!------------------------------------------------------------------------------------------
  Subcabecera 
 -------------------------------------------------------------------------------------------> 	
-	<P align=center><SPAN align=center class=subcabeceras><?php echo $TbMsg[6] ?></SPAN></p>
+	<P align=center><SPAN class=subcabeceras><?php echo $TbMsg[6] ?></SPAN></p>
 	<FORM  align=center name="fdatos"> 
 	<TABLE  width=90% align=center border=0 cellPadding=1 cellSpacing=1 class=tabla_datos>
 		<TR>
diff --git a/admin/WebConsole/comandos/IniciarSesion.php b/admin/WebConsole/comandos/IniciarSesion.php
index 404a004d..61eae5cf 100644
--- a/admin/WebConsole/comandos/IniciarSesion.php
+++ b/admin/WebConsole/comandos/IniciarSesion.php
@@ -6,7 +6,7 @@
 // Fecha Última modificación: Agosto-2010
 // Nombre del fichero: IniciarSesion.php
 // Descripción : 
-//		Implementación� del comando "Iniciar Sesión"
+//		Implementación del comando "Iniciar Sesión"
 // Version 0.1 - En ambito distinto a ordenador muestra los equipos agrupados en configuraciones iguales.
 // 	Fecha: 2014-10-23
 //	 Autora: Irina Gomez, ETSII Universidad de Sevilla
@@ -56,11 +56,10 @@ if (!$cmd)
                 $cadenaip="";
                 $cadenamac="";
                 RecopilaIpesMacs($cmd,$ambito,$idambito);
-	
+
         ?>
-	<P align=center>
-	<SPAN align=center class=subcabeceras><?php echo $TbMsg[7] ?></SPAN>
-	</BR>
+	<P align=center><SPAN class=subcabeceras><?php echo $TbMsg[7] ?></SPAN></P>
+	<BR>
 <form  align=center name="fdatos" method="POST"> 
 	<INPUT type="hidden" name="idambito" value="<?php echo $idambito?>">
 	<INPUT type="hidden" name="ambito" value="<?php echo $ambito?>">
@@ -134,9 +133,7 @@ function tabla_configuraciones($cmd,$idordenador){
 			  AND tipospar.clonable=1
 			  AND nombresos.nombreso!='DATA'
 			ORDER BY ordenadores_particiones.numpar";
-				
-	$rs->Comando=&$cmd; 
-	$rs=new Recordset; 
+	$rs=new Recordset;
 	$rs->Comando=&$cmd; 
 	if (!$rs->Abrir()) return($tablaHtml); // Error al abrir recordset
 	$rs->Primero(); 
diff --git a/admin/WebConsole/comandos/InventarioSoftware.php b/admin/WebConsole/comandos/InventarioSoftware.php
index b8756ec9..86d26376 100644
--- a/admin/WebConsole/comandos/InventarioSoftware.php
+++ b/admin/WebConsole/comandos/InventarioSoftware.php
@@ -69,7 +69,7 @@ switch($ambito){
 	</p>
 		<?php echo tablaConfiguracionesInventarioSoftware($cmd,$idambito); ?>
 
-	</BR>
+	<BR>
 <?php
 //________________________________________________________________________________________________________
 	include_once("./includes/formularioacciones.php");
diff --git a/admin/WebConsole/comandos/jscripts/InventarioSoftware.js b/admin/WebConsole/comandos/jscripts/InventarioSoftware.js
index 4910d047..103292d2 100644
--- a/admin/WebConsole/comandos/jscripts/InventarioSoftware.js
+++ b/admin/WebConsole/comandos/jscripts/InventarioSoftware.js
@@ -11,7 +11,6 @@
 	if (comprobar_datos()){
 		tb_conf=document.getElementById("tabla_conf");
 		var ochecks=tb_conf.getElementsByTagName('INPUT');
-		var particion;
 		for(var i=0;i<ochecks.length;i++){
 			if(ochecks[i].checked){
 				diskPart=ochecks[i].value.split(";");
diff --git a/admin/WebConsole/gestores/gestor_tareascomandos.php b/admin/WebConsole/gestores/gestor_tareascomandos.php
index c7f88ccd..fc8c9e88 100644
--- a/admin/WebConsole/gestores/gestor_tareascomandos.php
+++ b/admin/WebConsole/gestores/gestor_tareascomandos.php
@@ -59,12 +59,14 @@ function Gestiona(){
 	global $EJECUCION_COMANDO;
 	global $PROCESOS;
 	global $ACCION_INICIADA;
-	global $ACCION_SINERRORES; 
+	global $ACCION_SINERRORES;
+	global $ACCION_SINRESULTADO;
 	global $servidorhidra;
 	global $hidraport;
 	global $idcentro;
 	global $idtareacomando;
 	global $orden;
+	$resul=true;
 
 	$cmd->CreaParametro("@orden",$orden,1);
 
@@ -90,8 +92,6 @@ function Gestiona(){
 				$idambito=$Datos["idambito"];
 				$parametros=$Datos["parametros"];
 
-				$resul=true;
-
 				$cmd->CreaParametro("@tipoaccion",$EJECUCION_COMANDO,1);
 				$cmd->CreaParametro("@idtipoaccion",$idtipoaccion,1);
 				$cmd->CreaParametro("@cateaccion",$PROCESOS,1);
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
index 6f1d3545..e20b703f 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
@@ -4,13 +4,13 @@
 //	Php image file: crearimagenbasica_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='Generation of base image  <br> (experimental)' ;
 	$TbMsg[1]='Computer features';
-        $TbMsg[2]='Name';
-        $TbMsg[3]='IP Address';
-        $TbMsg[4]='MAC Address';
-        $TbMsg[5]='Hardware profile';
+	$TbMsg[2]='Name';
+	$TbMsg[3]='IP Address';
+	$TbMsg[4]='MAC Address';
+	$TbMsg[5]='Hardware profile';
 	$TbMsg[6]='Data to supply';
 	$TbMsg[7]='Disk';
 	$TbMsg[8]='Par';
@@ -20,5 +20,5 @@
 	$TbMsg[12]='Additional Options';
 	$TbMsg[13]='Delete image previously';
 	$TbMsg[14]='Copy image to cache';
-	$TbMsg[15]='Delete image previously from cache';
+	$TbMsg[15]='Deleting image previously from cache';
 	$TbMsg[16]='Do not delete files from target';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
index a26a34f4..d9a3ccce 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
@@ -4,15 +4,15 @@
 //	Php language file: crearsoftincremental_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
-	$TbMsg[0]='Generation of  incremental image  <br> (experimental)';
+	if (empty($TbMsg))  $TbMsg=array();
+	$TbMsg[0]='Generation of incremental image  <br> (experimental)';
 	$TbMsg[1]='Computer features';
 	$TbMsg[2]='Name';
 	$TbMsg[3]='IP Address';
 	$TbMsg[4]='MAC Address';
 	$TbMsg[5]='Hardware profile';
 	$TbMsg[6]='Data to supply';
-	$TbMsg[7]='Disco';
+	$TbMsg[7]='Disk';
 	$TbMsg[8]='Par';
 	$TbMsg[9]='OS name';
 	$TbMsg[10]='Incremental image / Repository';
@@ -20,5 +20,5 @@
 	$TbMsg[12]='Incremental software';
 	$TbMsg[13]='Delete Incremental previously';
 	$TbMsg[14]='Copy Incremental to cache';
-	$TbMsg[15]='Delete Incremental previously from cache';
-	$TbMsg[16]='Do not delete files  from target';
+	$TbMsg[15]='Deleting Incremental previously from cache';
+	$TbMsg[16]='Do not delete files from target';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
index 38e217ca..fa00a89f 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
@@ -54,7 +54,7 @@
 
 	$TbMsg["WCRP31"]='Remote partitions cloning Wizard';
 	$TbMsg["WCRP32"]='Select MASTER PC:';
-	$TbMsg["WCRP33"]='Select the image or partition to send from Master PC';
+	$TbMsg["WCRP33"]='Choose the image or partition to send from Master PC';
 	$TbMsg["WCRP34"]='Select the client target partition';
 	$TbMsg["WCRP35"]='Select the transfer mode';
 	$TbMsg["WCRP36"]='Select cloning tool';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
index 8582fc92..3259b608 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
@@ -4,19 +4,19 @@
 //	Php language file: eliminarimagenrepositorio_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='Image creation';
 	$TbMsg[1]='Computer features';
 	$TbMsg[2]='Name';
 	$TbMsg[3]='IP Address';
 	$TbMsg[4]='MAC Address';
-	$TbMsg[5]='Delete Image from Repository';
+	$TbMsg[5]='Deleting Image from Repository';
 	$TbMsg[6]='Data to supply';
 	$TbMsg[7]='Available Images';
 	$TbMsg[8]='Par';
 	$TbMsg[9]='OS name';
 	$TbMsg[10]='----------- Image name -----------';
-	$TbMsg[11]='Nº';
+	$TbMsg[11]='No.';
 	$TbMsg[12]='Mark';
 	$TbMsg[13]='Size';
 	$TbMsg[14]='Locked Image';
@@ -31,11 +31,11 @@
 	$TbMsg[23]='Version Limitations 1.5';
 	$TbMsg[24]='Deleting Image is allowed if Repository and Web server are hosted on the same server';
 	$TbMsg[25]='NOT Created';
-	$TbMsg[26]='Delete Image object';
+	$TbMsg[26]='Deleting Image object';
 	$TbMsg[27]='Type';
 	$TbMsg[28]='View Full Repository';
 	$TbMsg[29]='View Organizational Unit';
 	$TbMsg[30]='Organizational Unit';
 	$TbMsg[31]='Archive';
 	$TbMsg[32]='Directory';
-	$TbMsg[33]='WARNING: Image is hosted in a directory that does not match with the organizational unit.'
+	$TbMsg[33]='WARNING: Image is hosted in a directory that does not match with the organizational unit.';
diff --git a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
index f308484e..9191b82d 100644
--- a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
@@ -4,7 +4,7 @@
 //	Php language file: propiedades_aulas_eng.php
 //	Language: English
 //________________________________________________________
-$TbMsg=array();
+if (empty($TbMsg))  $TbMsg=array();
 $TbMsg[0]="No Option";
 $TbMsg[1]="Insert";
 $TbMsg[2]="Modify";
@@ -58,4 +58,4 @@ $TbMsg['PROP_REMOTEACCESS']="Remote access";
 $TbMsg['COMM_REMOTEACCESS']="allow remote access management to computers";
 $TbMsg['COMM_DEFOGLIVE']="Assigned by administrator";
 // Ticket-816 PCprofesor
-$TbMsg['PROP_PROFCOMPUTER']="Teacher‘s computer",
+$TbMsg['PROP_PROFCOMPUTER']="Teacher‘s computer";
diff --git a/admin/WebConsole/idiomas/php/eng/reservas_eng.php b/admin/WebConsole/idiomas/php/eng/reservas_eng.php
index ae1b8d82..ebcd2902 100644
--- a/admin/WebConsole/idiomas/php/eng/reservas_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/reservas_eng.php
@@ -4,9 +4,9 @@
 //	Pph language file: reserves_eng.php 
 //	Language: English 
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='"New reservations group"';
-	$TbMsg[1]='"Define new reservation";
+	$TbMsg[1]='"Define new reservation"';
 	$TbMsg[2]='"Set reserve"';
 	$TbMsg[3]='"Rename"';
 	$TbMsg[4]='"Delete reservations group"';
diff --git a/admin/WebConsole/includes/pintaTablaConfiguraciones.php b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
index 15a7ef94..6491856e 100644
--- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php
+++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
@@ -38,10 +38,10 @@ function tablaConfiguracionesIniciarSesion($cmd,$idambito,$ambito){
 	// CONSULTA BD: grupo de equipos con iguales sistemas operativos: idordenadores,configuracion
         $cmd->texto="";
         // agrupamos equipos con igual conf de disco.
-        $cmd->texto="select GROUP_CONCAT(pcconf.idordenador SEPARATOR ',') AS idordenadores, pcconf.configuraciones  FROM  (";
+        $cmd->texto="SELECT GROUP_CONCAT(pcconf.idordenador SEPARATOR ',') AS idordenadores, pcconf.configuraciones FROM (";
 
         // partconf agrupa la configuracion de todas las part: idordenador | configuracionTodasPart
-        $cmd->texto.=" select partconf.idordenador , GROUP_CONCAT(partconf.configuracion  ORDER BY partconf.configuracion ASC SEPARATOR '@'  ) AS configuraciones FROM (";
+        $cmd->texto.=" SELECT partconf.idordenador, GROUP_CONCAT(partconf.configuracion ORDER BY partconf.configuracion ASC SEPARATOR '@') AS configuraciones FROM (";
 
         // particion conf: idordenador, numdisk, configuracion (numdisk;numpar;idnombreso)
         $cmd->texto.="SELECT ordenadores_particiones.idordenador,ordenadores_particiones.numdisk, CONCAT_WS(';',ordenadores_particiones.numdisk, ordenadores_particiones.numpar, ordenadores_particiones.idnombreso) AS configuracion FROM ordenadores_particiones ";
diff --git a/admin/WebConsole/principal/colasacciones.php b/admin/WebConsole/principal/colasacciones.php
index 1c6558d7..35e2202b 100644
--- a/admin/WebConsole/principal/colasacciones.php
+++ b/admin/WebConsole/principal/colasacciones.php
@@ -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="";		
diff --git a/admin/WebConsole/principal/repositorios.php b/admin/WebConsole/principal/repositorios.php
index b7142bd6..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
 // *************************************************************************************************************************************************
diff --git a/admin/WebConsole/rest/ogagent.php b/admin/WebConsole/rest/ogagent.php
index 6b87b098..76cfd00a 100644
--- a/admin/WebConsole/rest/ogagent.php
+++ b/admin/WebConsole/rest/ogagent.php
@@ -32,6 +32,7 @@ function writeLog($message = "") {
 $app->post('/ogagent/started',
     function() use ($app) {
 	global $cmd;
+	$secret = "";
 	$osType = $osVersion = "none";
 	try {
 		// Reading POST parameters in JSON format.
@@ -131,6 +132,7 @@ $app->post('/ogagent/stopped',
 $app->post('/ogagent/loggedin',
     function() use ($app) {
 	global $cmd;
+	$osType = $osVersion = "none";
 	$redirto = Array();
 	$result = Array();
 
diff --git a/admin/WebConsole/varios/accionmenu.php b/admin/WebConsole/varios/accionmenu.php
index fed455d0..10d965c1 100644
--- a/admin/WebConsole/varios/accionmenu.php
+++ b/admin/WebConsole/varios/accionmenu.php
@@ -178,6 +178,7 @@ else
 
 function pintaMenus($cmd,$identificador,$tipoaccion,$op)
 { 
+	global $pagerror;
 	global $TbMsg;
 	global $ITEM_PUBLICO;
 	global $ITEM_PRIVADO;
diff --git a/admin/WebConsole/varios/menubrowser.php b/admin/WebConsole/varios/menubrowser.php
index c5878939..805ed60f 100644
--- a/admin/WebConsole/varios/menubrowser.php
+++ b/admin/WebConsole/varios/menubrowser.php
@@ -16,12 +16,11 @@ if(!empty($iph)){
 }
 ?>
 <HTML>
-<TITLE>Administración web de aulas</TITLE>
 <HEAD>
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-	<LINK rel="stylesheet" type="text/css" href="estilos.css">
-</HEAD>
-<SCRIPT LANGUAGE="JAVASCRIPT">
+    <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">
 //________________________________________________________________________________________________________
 function confirmar(){
 	if (comprobar_datos())
@@ -56,7 +55,7 @@ function PulsaEnter(oEvento){
 	return true; 
 } 
 //________________________________________________________________________________________________________
-</SCRIPT>
+    </SCRIPT>
 </HEAD>
 <BODY>
 <DIV style="POSITION:absolute;top:20;left:150">