#718: Estatus de OGAgent para macOS X y corregir errata en filtro de ordenadores para Linux.

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

8 files changed, 24 insertions, 16 deletions

diff --git a/admin/WebConsole/comandos/includes/FiltradoAmbito.php b/admin/WebConsole/comandos/includes/FiltradoAmbito.php
index fbcc19f2..4477a14e 100644
--- a/admin/WebConsole/comandos/includes/FiltradoAmbito.php
+++ b/admin/WebConsole/comandos/includes/FiltradoAmbito.php
@@ -188,6 +188,9 @@ function RecorriendoOrdenadores($cmd)
 <TD align="center">'.$TbMsg["STATUS_LNXS"].'</TD>

 <TD><INPUT  type="checkbox" checked onclick="selector(this,7,'.$cid.')"></TD>

 

+<TD align="center">'.$TbMsg["STATUS_OSX"].'</TD>

+<TD><INPUT  type="checkbox" checked onclick="selector(this,8,'.$cid.')"></TD>

+

 </TR>

 </TABLE>';

 	

@@ -306,6 +309,9 @@ function soIMG(so)
 		case 'LNXS':

 			MimgOrdenador="ordenador_LNXS.png"; // Sesión Linux

 			break;

+		case 'OSX':

+			MimgOrdenador="ordenador_OSX.png";  // macOS

+			break;

 		default:

 			MimgOrdenador="ordenador_OFF.png";	// Apagado

 			break;

@@ -328,42 +334,38 @@ function selector(oSLCT,op,id)
 				var oCHK = document.getElementById('chk-'+ip); // Recupera checkbox

 

 				switch(parseInt(op)){

-					case 1: // Apagados						

+					case 1: // Apagados

 						if(estado=="ordenador_OFF.png")

 							oCHK.checked=sw;

 						break;	

-						

 					case 2: // Ocupados

 						if(estado=="ordenador_BSY.png")

 							oCHK.checked=sw;

 						break;

-						

-					case 3: // Opengnsys

+					case 3: // OpenGnsys

 						if(estado=="ordenador_OPG.png")

 							oCHK.checked=sw;

 						break;

-						

 					case 4: // Windows

 						if(estado=="ordenador_WIN.png")

 							oCHK.checked=sw;

 						break;

-						

-					case 5: // Windows

+					case 5: // Sesión Windows

 						if(estado=="ordenador_WINS.png")

 							oCHK.checked=sw;

 						break;

-						

-					case 5: // Linux

+					case 6: // Linux

 						if(estado=="ordenador_LNX.png")

 							oCHK.checked=sw;

 						break;

-

-					case 7: // Linux

+					case 7: // Sesión Linux

 						if(estado=="ordenador_LNXS.png")

 							oCHK.checked=sw;

 						break;

-

-	

+					case 8: // macOS

+						if(estado=="ordenador_OSX.png")

+							oCHK.checked=sw;

+						break;

 				}

 			}

 		}

diff --git a/admin/WebConsole/idiomas/php/cat/estados_cat.php b/admin/WebConsole/idiomas/php/cat/estados_cat.php
index 93c3876b..77b35205 100644
--- a/admin/WebConsole/idiomas/php/cat/estados_cat.php
+++ b/admin/WebConsole/idiomas/php/cat/estados_cat.php
@@ -14,6 +14,7 @@ $TbMsg["STATUS_LNX"]="GNU/Linux";
 $TbMsg["STATUS_WXP"]="Windows";
 // Estats nou agent OGAgent.
 $TbMsg["STATUS_LNXS"]="Sessi&oacute; GNU/Linux";
+$TbMsg["STATUS_OSX"]="macOS";
 $TbMsg["STATUS_WIN"]="Windows";
 $TbMsg["STATUS_WINS"]="Sessi&oacute; Windows";
 ?>
diff --git a/admin/WebConsole/idiomas/php/eng/estados_eng.php b/admin/WebConsole/idiomas/php/eng/estados_eng.php
index c83f9238..1733629a 100644
--- a/admin/WebConsole/idiomas/php/eng/estados_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/estados_eng.php
@@ -14,6 +14,7 @@ $TbMsg["STATUS_LNX"]="GNU/Linux";
 $TbMsg["STATUS_WXP"]="Windows";
 // New OGAgent states.
 $TbMsg["STATUS_LNXS"]="GNU/Linux session";
+$TbMsg["STATUS_OSX"]="macOS";
 $TbMsg["STATUS_WIN"]="Windows";
 $TbMsg["STATUS_WINS"]="Windows session";
 ?>
diff --git a/admin/WebConsole/idiomas/php/esp/estados_esp.php b/admin/WebConsole/idiomas/php/esp/estados_esp.php
index 302e0761..75adfdf4 100644
--- a/admin/WebConsole/idiomas/php/esp/estados_esp.php
+++ b/admin/WebConsole/idiomas/php/esp/estados_esp.php
@@ -14,6 +14,7 @@ $TbMsg["STATUS_LNX"]="GNU/Linux";
 $TbMsg["STATUS_WXP"]="Windows";
 // Estados nuevo agente OGAgent.
 $TbMsg["STATUS_LNXS"]="Sesi&oacute;n GNU/Linux";
+$TbMsg["STATUS_OSX"]="macOS";
 $TbMsg["STATUS_WIN"]="Windows";
 $TbMsg["STATUS_WINS"]="Sesi&oacute;n Windows";
 ?>
diff --git a/admin/WebConsole/images/ordenador_OSX.png b/admin/WebConsole/images/ordenador_OSX.png
new file mode 100644
index 00000000..8816e0d1
--- /dev/null
+++ b/admin/WebConsole/images/ordenador_OSX.png
diff --git a/admin/WebConsole/jscripts/aula.js b/admin/WebConsole/jscripts/aula.js
index a1428740..cc8f03d7 100644
--- a/admin/WebConsole/jscripts/aula.js
+++ b/admin/WebConsole/jscripts/aula.js
@@ -132,6 +132,9 @@ function soIMG(so)
 		case 'LNXS':
 			MimgOrdenador="ordenador_LNXS.png"; // Sesión Linux
 			break;
+		case 'OSX':
+			MimgOrdenador="ordenador_OSX.png"; // macOS
+			break;
 		default:
 			MimgOrdenador="ordenador_OFF.png"; // Apagado
 			break;
diff --git a/admin/WebConsole/principal/aula.php b/admin/WebConsole/principal/aula.php
index 6cfe8524..f8df6853 100644
--- a/admin/WebConsole/principal/aula.php
+++ b/admin/WebConsole/principal/aula.php
@@ -298,11 +298,11 @@ function pintaordenadores(){
 	echo '<p>';
 	echo '<table style="border: #d4d0c8 1px solid; background: #eeeeee" align="center">';
 	echo '  <tr align="center" valign="top">';
-	foreach (Array ("OPG", "WIN", "LNX", "OFF") as $status) {
+	foreach (Array ("OPG", "WIN", "LNX", "OSX") as $status) {
 		echo '    <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.$TbMsg["STATUS_$status"].'</font></td>';
 	}
 	echo '  <tr align="center" valign="top">';
-	foreach (Array ("BSY", "WINS", "LNXS") as $status) {
+	foreach (Array ("BSY", "WINS", "LNXS", "OFF") as $status) {
 		echo '    <td><img src="../images/ordenador_'.$status.'.png" alt="'.$status.'" width="24" /><br /><font color="#003300" size="1" face="Arial, Helvetica, sans-serif">'.str_replace(" ", "<br>", $TbMsg["STATUS_$status"]).'</font></td>';
 	}
 	echo '  </tr>';
diff --git a/admin/WebConsole/principal/sondeo.php b/admin/WebConsole/principal/sondeo.php
index 27504587..3ed56e2e 100644
--- a/admin/WebConsole/principal/sondeo.php
+++ b/admin/WebConsole/principal/sondeo.php
@@ -80,7 +80,7 @@
 	// Launch concurrent requests.
 	$responses = multiRequest($urls);
 	// Process responses array (IP as array index).
-	foreach ($responses as $ip => $resp)) {
+	foreach ($responses as $ip => $resp) {
 		if (isset($resp['data'])) {
 			$data = json_decode($resp['data']);
 			// If user session is oppened, then append "S" to client status.