#708 #810: Añadir depuración en ruta de RemotePC; adaptar mensajes en propiedades de repositorio.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5495 a21b9725-9963-47de-94b9-378ad31fedc9

5 files changed, 8 insertions, 4 deletions

diff --git a/admin/WebConsole/idiomas/php/cat/propiedades_repositorios_cat.php b/admin/WebConsole/idiomas/php/cat/propiedades_repositorios_cat.php
index 55c4b2ac..9d76b2be 100644
--- a/admin/WebConsole/idiomas/php/cat/propiedades_repositorios_cat.php
+++ b/admin/WebConsole/idiomas/php/cat/propiedades_repositorios_cat.php
@@ -26,7 +26,7 @@ $TbMsg[17]='Api Token';
 $TbMsg['MSG_CONTENT']='Contenido';
 $TbMsg['MSG_IMAGE']='Imatge';
 $TbMsg['MSG_TYPE']='Tipo';
-$TbMsg['MSG_SIZEBYTES']='Tamaño (bytes)';
+$TbMsg['MSG_SIZE']='Tamaño';
 $TbMsg['MSG_MODIFIED']='Modificado';
 $TbMsg['MSG_PERMISSIONS']='Permisos';
 ?>
diff --git a/admin/WebConsole/idiomas/php/eng/propiedades_repositorios_eng.php b/admin/WebConsole/idiomas/php/eng/propiedades_repositorios_eng.php
index f74906e7..b26ec949 100644
--- a/admin/WebConsole/idiomas/php/eng/propiedades_repositorios_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/propiedades_repositorios_eng.php
@@ -26,7 +26,7 @@ $TbMsg[17]='Api Token';
 $TbMsg['MSG_CONTENT']='Content';
 $TbMsg['MSG_IMAGE']='Image';
 $TbMsg['MSG_TYPE']='Type';
-$TbMsg['MSG_SIZEBYTES']='Size (bytes)';
+$TbMsg['MSG_SIZE']='Size';
 $TbMsg['MSG_MODIFIED']='Modified';
 $TbMsg['MSG_PERMISSIONS']='Permissions';
 ?>
diff --git a/admin/WebConsole/idiomas/php/esp/propiedades_repositorios_esp.php b/admin/WebConsole/idiomas/php/esp/propiedades_repositorios_esp.php
index a2d3852f..76a10548 100644
--- a/admin/WebConsole/idiomas/php/esp/propiedades_repositorios_esp.php
+++ b/admin/WebConsole/idiomas/php/esp/propiedades_repositorios_esp.php
@@ -26,7 +26,7 @@ $TbMsg[17]='Api Token';
 $TbMsg['MSG_CONTENT']='Contenido';
 $TbMsg['MSG_IMAGE']='Imagen';
 $TbMsg['MSG_TYPE']='Tipo';
-$TbMsg['MSG_SIZEBYTES']='Tamaño (bytes)';
+$TbMsg['MSG_SIZE']='Tamaño';
 $TbMsg['MSG_MODIFIED']='Modificado';
 $TbMsg['MSG_PERMISSIONS']='Permisos';
 ?>
diff --git a/admin/WebConsole/propiedades/propiedades_repositorios.php b/admin/WebConsole/propiedades/propiedades_repositorios.php
index 22ae1676..3d261cbe 100644
--- a/admin/WebConsole/propiedades/propiedades_repositorios.php
+++ b/admin/WebConsole/propiedades/propiedades_repositorios.php
@@ -175,7 +175,7 @@ if($apiKeyRepo != ""){
 				if($repoWithApi == true && is_array($repoImages)){

 					echo "<tr class='tabla_listados_sin'><th colspan='4'>".$TbMsg['MSG_CONTENT']." $repodir</th></tr>\n";

 

-echo "<tr><td>".$TbMsg['MSG_IMAGE']." (".$TbMsg['MSG_TYPE'].")</td><td>".$TbMsg['MSG_SIZEBYTES']."</td><td>".$TbMsg['MSG_MODIFIED']."</td><td>".$TbMsg['MSG_PERMISSIONS']."</td></tr>\n";

+echo "<tr><td>".$TbMsg['MSG_IMAGE']." (".$TbMsg['MSG_TYPE'].")</td><td>".$TbMsg['MSG_SIZE']."</td><td>".$TbMsg['MSG_MODIFIED']."</td><td>".$TbMsg['MSG_PERMISSIONS']."</td></tr>\n";

 		   			foreach($repoImages as $image){

 		   				echo "<tr class='tabla_listados_sin'>";

 		   				echo "<td>".$image->name." (".$image->type.")</td>";

diff --git a/admin/WebConsole/rest/remotepc.php b/admin/WebConsole/rest/remotepc.php
index f1e02e27..bd347d06 100644
--- a/admin/WebConsole/rest/remotepc.php
+++ b/admin/WebConsole/rest/remotepc.php
@@ -498,6 +498,8 @@ EOD;
 			$agentkey = $rs->campos["agentkey"];
 			// DB Transaction: set reservation time to the past and
 			// remove pending boot commands from client's and agent's queues.
+			if ($app->settings['debug'])
+				writeRemotepcLog($app->request()->getResourceUri(). ": Updating database.");
 			$cmd->texto = "START TRANSACTION;";
 			$cmd->Ejecutar();
 			$cmd->texto = <<<EOD
@@ -520,6 +522,8 @@ EOD;
 			$cmd->texto = "COMMIT;";
 			$cmd->Ejecutar();
 			// Send a poweroff command to client's OGAgent.
+			if ($app->settings['debug'])
+				writeRemotepcLog($app->request()->getResourceUri(). ": OGAgent poweroff, url=".$ogagent[$clntip]['url'].".");
 			$ogagent[$clntip]['url'] = "https://$clntip:8000/opengnsys/poweroff";
 			$ogagent[$clntip]['header'] = Array("Authorization: ".$agentkey);
 			$result = multiRequest($ogagent);