integrando modulos web version 1.0 ticket:301

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

1 files changed, 84 insertions, 2 deletions

diff --git a/admin/WebConsole/propiedades/propiedades_aulas.php b/admin/WebConsole/propiedades/propiedades_aulas.php
index e77efe11..afd914dd 100644
--- a/admin/WebConsole/propiedades/propiedades_aulas.php
+++ b/admin/WebConsole/propiedades/propiedades_aulas.php
@@ -167,7 +167,62 @@ else
 			?>
 		</TR>	
 <!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+<!----ADV  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
 		<TR>
+			<TH align=center&nbsp;> Router &nbsp;</TD>
+			<?
+				if ($opcion==$op_eliminacion)
+					echo '<TD colspan=3>'.$router.'</TD>';
+				else
+					echo '<TD colspan=3><INPUT  class="formulariodatos" name=router style="width:100" type=text value='.$router.'></TD>';
+			?>
+		</TR>				
+<!-----ADV -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+		<TR>
+			<TH align=center&nbsp;> Netmask &nbsp;</TD>
+			<?
+				if ($opcion==$op_eliminacion)
+					echo '<TD colspan=3>'.$netmask.'</TD>';
+				else
+					echo '<TD colspan=3><INPUT  class="formulariodatos" name=netmask style="width:100" type=text value='.$netmask.'></TD>';
+			?>
+		</TR>				
+<!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+
+<!-----ADV -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+		<TR>
+			<TH align=center&nbsp;> P2P Modo: &nbsp;</TD>
+			<?
+				if ($opcion==$op_eliminacion)
+					echo '<TD colspan=3>'.$modp2p.'</TD>';
+				else
+					echo '<TD colspan=3>';
+					$p2pmetodos="seeder=seeder".chr(13);
+					$p2pmetodos.="leecher=leecher".chr(13);
+					$p2pmetodos.="peer=peer";
+					echo HTMLCTESELECT($p2pmetodos,"modp2p","estilodesple","",$modp2p,100).'</TD>';
+			?>
+		</TR>				
+<!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+
+<!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+		<TR>
+			<TH align=center&nbsp;> P2P tiempo (seg) para semilla: &nbsp;</TD>
+			<?
+				if ($opcion==$op_eliminacion)
+					echo '<TD colspan=3>'.$timep2p.'</TD>';
+				else
+					echo '<TD colspan=3><INPUT  class="formulariodatos" name=timep2p style="width:100" type=text value='.$timep2p.'></TD>';
+			?>
+		</TR>				
+<!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+
+					
+
+
+
+
+	<TR>
 			<TH align=center&nbsp;><?echo $TbMsg[22]?>&nbsp;</TD>
 			<?
 				if ($opcion==$op_eliminacion){
@@ -201,7 +256,15 @@ else
 				if ($opcion==$op_eliminacion)
 					echo '<TD colspan=3>'.$pormul.'</TD>';
 				else
-					echo '<TD colspan=3><INPUT  class="formulariodatos" name=pormul style="width:100" type=text value='.$pormul.'></TD>';
+					echo '<TD colspan=3>';
+					$pormulmetodos="9000=9000".chr(13);
+					$pormulmetodos.="9002=9002".chr(13);
+					$pormulmetodos.="9004=9004".chr(13);
+					$pormulmetodos.="9006=9006".chr(13);
+					$pormulmetodos.="9010=9010".chr(13);
+					$pormulmetodos.="9012=9012".chr(13);
+					$pormulmetodos.="9014=9014";
+					echo HTMLCTESELECT($pormulmetodos,"pormul","estilodesple","",$pormul,100).'</TD>';
 			?>
 		</TR>				
 <!------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
@@ -314,7 +377,12 @@ function TomaPropiedades($cmd,$ida)
 	global $gidrepositorio;
 	global $gidperfilhard;
 	global $gcache;
-	
+###################### ADV	
+	global $router;
+	global $netmask;
+	global $modp2p;
+	global $timep2p;
+###################### ADV
 	global $modomul;
 	global $ipmul;
 	global $pormul;
@@ -332,6 +400,12 @@ function TomaPropiedades($cmd,$ida)
 	$horaresevini=0;
 	$horaresevfin=0;
 	$grupoid=0;	
+## ADV #########################################
+	$router=0;
+	$netmask=0;
+    $modp2p=0;
+	$timep2p=0;
+### ADV	 ########################################
 	$modomul=0;
 	$ipmul=0;
 	$pormul=0;
@@ -349,6 +423,8 @@ function TomaPropiedades($cmd,$ida)
 	$gidperfilhard=0;
 	$gcache=0;
 	
+
+	
 	$rs=new Recordset; 
 	$cmd->texto="SELECT count( * ) AS numordenadores, aulas.* , 
 				group_concat(DISTINCT cast( ordenadores.idmenu AS char( 11 ) )  
@@ -387,6 +463,12 @@ function TomaPropiedades($cmd,$ida)
 		$ipmul=$rs->campos["ipmul"];
 		$pormul=$rs->campos["pormul"];
 		$velmul=$rs->campos["velmul"];
+#################### ADV		
+		$router=$rs->campos["router"];
+		$netmask=$rs->campos["netmask"];
+		$modp2p=$rs->campos["modp2p"];
+		$timep2p=$rs->campos["timep2p"];
+###################### ADV
 
 		$ordenadores=$rs->campos["numordenadores"];
 		$idmenu=$rs->campos["idmenus"];