diff options
Diffstat (limited to 'admin/WebConsole/asistentes')
8 files changed, 150 insertions, 141 deletions
diff --git a/admin/WebConsole/asistentes/includes/asistentes/AyudanteFormularios.php b/admin/WebConsole/asistentes/includes/asistentes/AyudanteFormularios.php index 9947dcf7..c803a6bb 100644 --- a/admin/WebConsole/asistentes/includes/asistentes/AyudanteFormularios.php +++ b/admin/WebConsole/asistentes/includes/asistentes/AyudanteFormularios.php @@ -458,4 +458,4 @@ function pintaParticionesAsistenteDeployImage($cmd,$configuraciones,$idordenador echo '<TR height=5><TD colspan='.$colums.' style="BORDER-TOP: #999999 1px solid;BACKGROUND-COLOR: #FFFFFF;"> </TD></TR>';
}
-?>
+
diff --git a/admin/WebConsole/asistentes/includes/asistentes/formCloneRemotePartition.php b/admin/WebConsole/asistentes/includes/asistentes/formCloneRemotePartition.php index 0b0282b9..4caff0ae 100644 --- a/admin/WebConsole/asistentes/includes/asistentes/formCloneRemotePartition.php +++ b/admin/WebConsole/asistentes/includes/asistentes/formCloneRemotePartition.php @@ -4,7 +4,7 @@ <tr> <td class="op_basic"> <?php echo $TbMsg["WCRP32"] ?> - <select name="ipMaster" id="ipMaster" style="width:220" onChange="ListarOrigenesMaster(this.value);"> + <select name="ipMaster" id="ipMaster" style="width:220px" onChange="ListarOrigenesMaster(this.value);"> <option value=""> -- <?php echo $TbMsg["WCRP32"] ?> -- </option> <?php echo ''.htmlOPTION_equipos($cmd,$ambito,$idambito).''; ?> </select> @@ -14,7 +14,7 @@ <div id="ajaxDiv"></div> <br /> <?php echo $TbMsg["WCRP34"] ?> - <select name="targetpart" id="targetpart" style="width:220;"> + <select name="targetpart" id="targetpart" style="width:220px;"> <option value="1 1"> 1er disco - 1ª particion </option> <option value="1 2"> 1er disco - 2ª particion </option> <option value="1 3"> 1er disco - 3ª particion </option> @@ -22,19 +22,19 @@ </select> <br /> <?php echo $TbMsg["WCRP35"] ?> - <select name="idmetodo" id="idmetodo" style="width:220;"> + <select name="idmetodo" id="idmetodo" style="width:220px;"> <option value="MULTICAST"> MULTICAST </option> <option value="UNICAST"> UNICAST </option> </select> <br /> <?php echo $TbMsg["WCRP36"] ?> - <select name="tool" id="tool" style="width:220;"> + <select name="tool" id="tool" style="width:220px;"> <option value="partclone"> partclone </option> <!-- <option value="partimage"> partimage </option> --> </select> <br /> <?php echo $TbMsg["WCRP37"] ?> - <select name="compresor" id="compresor" style="width:220;"> + <select name="compresor" id="compresor" style="width:220px;"> <option value="lzop"> lzop </option> <option value="gzip"> gzip </option> </select> diff --git a/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php b/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php index 4aece176..c75c9abd 100644 --- a/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php +++ b/admin/WebConsole/asistentes/includes/asistentes/formDeployImage.php @@ -8,7 +8,7 @@ $diskPartIndex = 0; for($cfgIndex = 0; $cfgIndex < $conKeys; $cfgIndex++){ if($tbKeys[$cfgIndex]["numpar"] != 0 && $tbKeys[$cfgIndex]["clonable"] == 1){ $disksPartitions[$diskPartIndex]["text"] = "Disco ".$tbKeys[$cfgIndex]["numdisk"]." - Part ".$tbKeys[$cfgIndex]["numpar"]; - $disksPartitions[$diskPartIndex]["value"] = $tbKeys[$cfgIndex]["numdisk"].";".$tbKeys[$cfgIndex]["numpar"]; + $disksPartitions[$diskPartIndex]["value"] = $tbKeys[$cfgIndex]["numdisk"].";".$tbKeys[$cfgIndex]["numpar"].";".$tbKeys[$cfgIndex]["tipopar"]; $diskPartIndex++; } } @@ -25,21 +25,16 @@ for($cfgIndex = 0; $cfgIndex < $conKeys; $cfgIndex++){ <td class="op_basic"> <?php echo $TbMsg["WDI20"] ?> - <select name="idparticion" id="idparticion" style="WIDTH:220"> + <select name="idparticion" id="idparticion" style="width:220px"> <?php foreach($disksPartitions as $diskPartition){ echo "<option value='".$diskPartition["value"]."'>".$diskPartition["text"]." </option>"; } ?> - <!-- - <option value="1"> 1 </option> - <option value="2"> 2 </option> - <option value="3"> 3 </option> - --> </select> <br /> <?php echo $TbMsg["WDI21"] ?> - <select name="idimagen" id="idimagen" style="WIDTH:220"> + <select name="idimagen" id="idimagen" style="width:220px"> <option value=""> <?php echo $TbMsg["WDI22"] ?></option> <?php echo ''. htmlOPTION_images($cmd,$ambito,$idambito) .''; ?> </select> @@ -47,7 +42,7 @@ for($cfgIndex = 0; $cfgIndex < $conKeys; $cfgIndex++){ <?php echo $TbMsg["WDI23"] ?> <br /> - <select name="idmetodo" id="idmetodo" style="WIDTH:220;"> + <select name="idmetodo" id="idmetodo" style="width:220px;"> <option value="TORRENT"> TORRENT </option> <option value="MULTICAST"> MULTICAST </option> <option value="MULTICAST-DIRECT"> MULTICAST-DIRECT </option> diff --git a/admin/WebConsole/asistentes/includes/asistentes/formParticionado_gpt.php b/admin/WebConsole/asistentes/includes/asistentes/formParticionado_gpt.php index 9069815f..43f1d4e7 100644 --- a/admin/WebConsole/asistentes/includes/asistentes/formParticionado_gpt.php +++ b/admin/WebConsole/asistentes/includes/asistentes/formParticionado_gpt.php @@ -15,7 +15,7 @@ for ($p=1; $p<4; $p++) { <td> <input type="checkbox" id="checkGPT'.$p.'" name="checkGPT'.$p.'" value="checkGPT'.$p.'" onclick="clickPartitionCheckbox(this.form, '.$p.',true);" /> '.$TbMsg[20].' '.$p.'</td> <td> -<select name="partGPT'.$p.'" id="partGPT'.$p.'" style="width:220" disabled="true" onclick=" +<select name="partGPT'.$p.'" id="partGPT'.$p.'" style="width:220px" disabled="true" onclick=" //if (this.form.part'.$p.'.options[this.form.part'.$p.'.selectedIndex].value == \'CUSTOM\') { if (this.options[this.selectedIndex].value == \'CUSTOM\') { this.form.partGPT'.$p.'custom.disabled=false; @@ -24,10 +24,10 @@ for ($p=1; $p<4; $p++) { }">'.htmlForm_typepart($cmd,$p).'<option value="CUSTOM"> '.$TbMsg[39].' </option> </select> <br> -<select name="partGPT'.$p.'custom" id="partGPT'.$p.'custom" style="width:220" disabled="true" >'. htmlForm_typepartnotcacheGPT($p) .'</select> +<select name="partGPT'.$p.'custom" id="partGPT'.$p.'custom" style="width:220px" disabled="true" >'. htmlForm_typepartnotcacheGPT($p) .'</select> </td> <td> -<select name="sizeGPT'.$p.'" id="sizeGPT'.$p.'" style="width:220" disabled="true" onclick=" +<select name="sizeGPT'.$p.'" id="sizeGPT'.$p.'" style="width:220px" disabled="true" onclick=" if (this.form.sizeGPT'.$p.'.options[this.form.sizeGPT'.$p.'.selectedIndex].value == \'CUSTOM\') { this.form.sizeGPT'.$p.'custom.disabled=false; } else { @@ -37,7 +37,7 @@ for ($p=1; $p<4; $p++) { <option value="CUSTOM"> '.$TbMsg[39].'</option> </select> <br /> -<input type="text" style="width:100" id="sizeGPT'.$p.'custom" name="sizeGPT'.$p.'custom" value="0" disabled="true" onchange="calculateFreeDisk(this.form);" /> +<input type="text" style="width:100px" id="sizeGPT'.$p.'custom" name="sizeGPT'.$p.'custom" value="0" disabled="true" onchange="calculateFreeDisk(this.form);" /> </td> </tr> '; @@ -47,15 +47,15 @@ for ($p=1; $p<4; $p++) { <tr id="trPartition4"> <td><input type="checkbox" name="checkGPT4" value="checkGPT4" onclick="clickPartitionCheckbox(this.form, 4,true);" /> <?php echo $TbMsg[20].' '.$p;?> </td> <td> -<select name="partGPT4" id="partGPT4" style="width:220" disabled="true" onchange="checkExtendedPartition(form);"><?php echo htmlForm_typepartnotcacheGPT(4) ?></select> +<select name="partGPT4" id="partGPT4" style="width:220px" disabled="disabled" onchange="checkExtendedPartition(form);"><?php echo htmlForm_typepartnotcacheGPT(4) ?></select> </td> -<td><select name="sizeGPT4" id="sizeGPT4" style="width:220" disabled="true" onclick="if (this.form.sizeGPT4.options[this.form.sizeGPT4.selectedIndex].value == 'CUSTOM') { this.form.sizeGPT4custom.disabled=false } else { this.form.sizeGPT4custom.disabled=true }" onchange="calculateFreeGPTDisk(this.form);" /> +<td><select name="sizeGPT4" id="sizeGPT4" style="width:220px" disabled="disabled" onclick="if (this.form.sizeGPT4.options[this.form.sizeGPT4.selectedIndex].value == 'CUSTOM') { this.form.sizeGPT4custom.disabled=false } else { this.form.sizeGPT4custom.disabled=true }" onchange="calculateFreeGPTDisk(this.form);"> <option value="0"> <?php echo $TbMsg[40];?> </option> <?php echo ''. htmlForm_sizepart($cmd,4) .''; ?> <option value="CUSTOM"> <?php echo $TbMsg[39];?> </option> </select> <br /> -<input type="text" style="width:100" name="sizeGPT4custom" value="0" disabled="true" onchange="calculateFreeGPTDisk(this.form);" /></td> +<input type="text" style="width:100px" name="sizeGPT4custom" value="0" disabled="disabled" onchange="calculateFreeGPTDisk(this.form);" /></td> </tr> </table> </td> @@ -76,5 +76,3 @@ for ($p=1; $p<4; $p++) { </th> </tr> -</td> - diff --git a/admin/WebConsole/asistentes/includes/asistentes/formParticionado_msdos.php b/admin/WebConsole/asistentes/includes/asistentes/formParticionado_msdos.php index b1d6b079..08162326 100644 --- a/admin/WebConsole/asistentes/includes/asistentes/formParticionado_msdos.php +++ b/admin/WebConsole/asistentes/includes/asistentes/formParticionado_msdos.php @@ -59,15 +59,15 @@ for ($p=1; $p<4; $p++) { </select> <br /> --> -<select name="part4" id="part4" style="width:220" disabled="true" onchange="checkExtendedPartition(form);"><?php echo htmlForm_typepartnotcacheEngine10(4) ?></select> +<select name="part4" id="part4" style="width:220px" disabled="disabled" onchange="checkExtendedPartition(form);"><?php echo htmlForm_typepartnotcacheEngine10(4) ?></select> </td> -<td><select name="size4" id="size4" style="width:220" disabled="true" onclick="if (this.form.size4.options[this.form.size4.selectedIndex].value == 'CUSTOM') { this.form.size4custom.disabled=false } else { this.form.size4custom.disabled=true }" onchange="calculateFreeDisk(this.form);" /> +<td><select name="size4" id="size4" style="width:220px" disabled="disabled" onclick="if (this.form.size4.options[this.form.size4.selectedIndex].value == 'CUSTOM') { this.form.size4custom.disabled=false } else { this.form.size4custom.disabled=true }" onchange="calculateFreeDisk(this.form);"> <option value="0"> <?php echo $TbMsg[40];?> </option> <?php echo ''. htmlForm_sizepart($cmd,4) .''; ?> <option value="CUSTOM"> <?php echo $TbMsg[39];?> </option> </select> <br /> -<input type="text" style="width:100" name="size4custom" value="0" disabled="true" onchange="calculateFreeDisk(this.form);" /></td> +<input type="text" style="width:100px" name="size4custom" value="0" disabled="disabled" onchange="calculateFreeDisk(this.form);" /></td> </tr> </table> @@ -132,5 +132,3 @@ for ($p=5; $p<=9; $p++) { <?php echo $TbMsg[38];?>: <input type="text" id="freedisk" width="15" disabled="true" /> </th> </tr> - - diff --git a/admin/WebConsole/asistentes/includes/capturaacciones.php b/admin/WebConsole/asistentes/includes/capturaacciones.php index a6fa089d..3c24bce0 100644 --- a/admin/WebConsole/asistentes/includes/capturaacciones.php +++ b/admin/WebConsole/asistentes/includes/capturaacciones.php @@ -27,5 +27,5 @@ if (isset($_POST["nombreambito"])) $nombreambito=$_POST["nombreambito"]; if (isset($_POST["funcion"])) $funcion=$_POST["funcion"]; if (isset($_POST["atributos"])) $atributos=$_POST["atributos"]; if (isset($_POST["gestor"])) $gestor=$_POST["gestor"]; -?> + diff --git a/admin/WebConsole/asistentes/includes/opcionesacciones.php b/admin/WebConsole/asistentes/includes/opcionesacciones.php index a598b090..31601278 100644 --- a/admin/WebConsole/asistentes/includes/opcionesacciones.php +++ b/admin/WebConsole/asistentes/includes/opcionesacciones.php @@ -63,9 +63,9 @@ <TD> </TD> <TD> </TD> <TD><?php echo $TbMsgAux[8] ?> </TD> - <TD><INPUT maxlength=3 style="FONT-FAMILY:Arial, Helvetica, sans-serif;FONT-SIZE: 11px;WIDTH:30" name=ordprocedimiento type=text value=""></TD></TR> + <TD><INPUT maxlength=3 style="FONT-FAMILY:Arial, Helvetica, sans-serif;FONT-SIZE: 11px;WIDTH:30px" name=ordprocedimiento type=text value=""></TD></TR> <!--------------------------------------------------------------------------------------------------------------------------------> - <TR HEIGHT=10><TD colspan=4> <HR></TD></TR> + <TR><TD colspan=4 height="10px"> <HR></TD></TR> <!--------------------------------------------------------------------------------------------------------------------------------> <TR> <TD><INPUT onclick="clic_mktarea(this)" name=sw_mktarea type=checkbox></TD> @@ -87,7 +87,7 @@ <TD> </TD> <TD> </TD> <TD><?php echo $TbMsgAux[12] ?> </TD> - <TD><INPUT maxlength=3 style="FONT-FAMILY:Arial, Helvetica, sans-serif;FONT-SIZE: 11px;WIDTH:30" name=ordtarea type=text value=""></TD></TR> + <TD><INPUT maxlength=3 style="FONT-FAMILY:Arial, Helvetica, sans-serif;FONT-SIZE: 11px;WIDTH:30px" name=ordtarea type=text value=""></TD></TR> <!--------------------------------------------------------------------------------------------------------------------------------> </TABLE> </FORM> diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js index 59446868..b26eef01 100644 --- a/admin/WebConsole/asistentes/jscripts/asistentes.js +++ b/admin/WebConsole/asistentes/jscripts/asistentes.js @@ -18,7 +18,7 @@ // *********************************************************************************************************** function codeCloneRemotePartition(form){ -var command ; +var protocol; switch (form.idmetodo.value) { case "MULTICAST": @@ -29,7 +29,7 @@ switch (form.idmetodo.value) break; } //form.codigo.value="cloneRemoteFromMaster " + form.ipMaster.value + " 1 " + form.PartOrigen.value + " " + form.mcastpuerto.value + ":" + form.mcastmodo.value + ":" + form.mcastdireccion.value + ":" + form.mcastvelocidad.value + "M:" + form.mcastnclien.value + ":" + form.mcastseg.value + " 1 " + form.PartOrigen.value + " " + form.tool.value + " " + form.compresor.value; -command="cloneRemoteFromMaster " + form.ipMaster.value + " " + form.source.value + " " + protocol + " " + form.targetpart.value + " " + form.tool.value + " " + form.compresor.value; +var command="cloneRemoteFromMaster " + form.ipMaster.value + " " + form.source.value + " " + protocol + " " + form.targetpart.value + " " + form.tool.value + " " + form.compresor.value; form.codigo.value="\ ogEcho log session \"[0] $MSG_SCRIPTS_TASK_START " + command + "\"\n \ ogExecAndLog command " + command + " \n "; @@ -52,6 +52,10 @@ function enableDirect(form){ function codeDeployImage(form){ +var diskPart; +var imagen; +var command; + switch (form.idmetodo.value) { case "MULTICAST": @@ -72,14 +76,14 @@ switch (form.idmetodo.value) } // Datos imagen -var imagen = form.idimagen.value.split("_"); +imagen = form.idimagen.value.split("_"); //form.codigo.value="deployImage REPO /"; if (form.modo[0].checked) { // UHU - Distinguimos entre disco y particion, el valor de idparticion sera disco;particion. eje. 1;1 - var diskPart = form.idparticion.value.split(";"); - var imagen = form.idimagen.value.split("_"); + diskPart = form.idparticion.value.split(";"); + imagen = form.idimagen.value.split("_"); command="deployImage " + imagen[0] + " /" + imagen[1] + " "+diskPart[0]+" " + diskPart[1] + " " + protocol ; form.codigo.value="\ ogEcho log session \"[0] $MSG_SCRIPTS_TASK_START " + command + "\"\n \ " + @@ -89,10 +93,12 @@ command + " \n"; form.atrib_restore.value = "dsk=" + diskPart[0] + "@par="+ diskPart[1] +"@idi=" +imagen[2] + "@nci="+imagen[1] + "@ipr="+ imagen[0] +"@ifs=" +imagen[3] + "@ptc="+protocol +"@"; + // Si la partición es EFI mostramos un aviso. + if (diskPart[2] == "EFI") alert (TbMsg['EFIPART']); } else { - command="updateCache REPO /" + imagen[1] + ".img" + " " + protocol ; + command="updateCache " + imagen[0] + " /" + imagen[1] + ".img" + " " + protocol ; form.codigo.value="\ ogEcho log session \"[0] $MSG_SCRIPTS_TASK_START " + command +"\"\n \ " + command + " \n"; @@ -109,9 +115,11 @@ function modificarCodigo() { function codeParticionado(form){ var n_disk = form.n_disk.value; var tipo_part_table = form.tipo_part_table.value; + var freedisk; + var freediskGPT; // Comprobamos si la opcion elejida es GPT o MSDOS para llamar a una funcion u otra - if(tipo_part_table == "GPT"){ - var freediskGPT = parseInt(document.getElementById("freediskGPT").value); + if(tipo_part_table === "GPT"){ + freediskGPT = parseInt(document.getElementById("freediskGPT").value); // Comprobamos que el espacio libre en el disco no sea negativo, si lo es, dar aviso if(freediskGPT < 0){ alert(TbMsg['NODISKSIZE']); @@ -124,7 +132,7 @@ function codeParticionado(form){ } } else{ - var freedisk = parseInt(document.getElementById("freedisk").value); + freedisk = parseInt(document.getElementById("freedisk").value); // Comprobamos que el espacio libre en el disco no sea negativo, si lo es, dar aviso if(freedisk < 0){ alert(TbMsg['NODISKSIZE']); @@ -136,7 +144,6 @@ function codeParticionado(form){ codeParticionadoMSDOS(form); } } - } @@ -150,19 +157,23 @@ function codeParticionadoMSDOS (form) { var n_disk = form.n_disk.value; var tipo_part_table = form.tipo_part_table.value; var maxParts = 4; - var swapPart = new Array(); + var swapPart = []; var swapCode = ""; - + var partCheck; + var partType; + var partTypeCustom; + var partSize; + var partSizeCustom; // Comprobamos si esta seleccionada la cuarta particion y no es CACHE - if(form.check4.checked && form.part4.value != "CACHE") - maxParts = 5; + if(form.check4.checked && form.part4.value !== "CACHE") + maxParts = 5; for (var nPart=1; nPart<maxParts; nPart++) { - var partCheck=eval("form.check"+nPart); + partCheck=eval("form.check"+nPart); if (partCheck.checked) { - var partType=eval("form.part"+nPart); - if (partType.value == "CUSTOM" ) { - var partTypeCustom=eval("form.part"+nPart+"custom"); + partType=eval("form.part"+nPart); + if (partType.value === "CUSTOM" ) { + partTypeCustom=eval("form.part"+nPart+"custom"); partCode += " " + partTypeCustom.value; switch(partTypeCustom.value) { case "EXTENDED": @@ -184,9 +195,9 @@ function codeParticionadoMSDOS (form) { break; } } - var partSize=eval("form.size"+nPart); - if (partSize.value == "CUSTOM" ) { - var partSizeCustom=eval("form.size"+nPart+"custom"); + partSize=eval("form.size"+nPart); + if (partSize.value === "CUSTOM" ) { + partSizeCustom=eval("form.size"+nPart+"custom"); partCode += ":" + partSizeCustom.value; } else { partCode += ":" + partSize.value; @@ -195,19 +206,18 @@ function codeParticionadoMSDOS (form) { partCode += " EMPTY:0"; } } - var cacheCode=""; // Si se selecciono la particion 4 y es CACHE - if(form.part4.value == "CACHE"){ + if(form.part4.value === "CACHE"){ if (form.check4.checked) { - if (form.size4.value == "0") { + if (form.size4.value === "0") { sizecacheCode="\ ogEcho session \"[20] $MSG_HELP_ogGetCacheSize\"\n \ -sizecache=`ogGetCacheSize` "; +sizecache=`ogGetCacheSize` \n "; cacheCode="\ initCache "+n_disk+" $sizecache NOMOUNT &>/dev/null \n "; } else { - if (form.size4.value == "CUSTOM") { + if (form.size4.value === "CUSTOM") { cacheSize = form.size4custom.value; } else { cacheSize = form.size4.value; @@ -215,40 +225,40 @@ initCache "+n_disk+" $sizecache NOMOUNT &>/dev/null \n "; cacheCode="\ initCache " + n_disk + " " + cacheSize + " NOMOUNT &>/dev/null \n "; } - cacheCode += "ogEcho session \"[60] $MSG_HELP_ogListPartitions "+n_disk+"\" \n "; - cacheCode += "ogExecAndLog command session ogListPartitions "+n_disk+" \n "; + cacheCode += "ogEcho session \"[60] $MSG_HELP_ogListPartitions "+n_disk+"\" \n "; + cacheCode += "ogExecAndLog command session ogListPartitions "+n_disk+" \n "; } else { -partCode += " EMPTY:0"; + partCode += " EMPTY:0"; } } if (extended) { var lastLogical=5; - for (var nPart=9; nPart>5; nPart--) { + for (nPart=9; nPart>5; nPart--) { if (eval ("form.check"+nPart+".checked")) { lastLogical = nPart; break; } } - for (var nPart=5; nPart<=lastLogical; nPart++) { - var partCheck=eval("form.check"+nPart); + for (nPart=5; nPart<=lastLogical; nPart++) { + partCheck=eval("form.check"+nPart); if (partCheck.checked) { - var partType=eval("form.part"+nPart); - if (partType.value == "CUSTOM" ) { - var partTypeCustom=eval("form.part"+nPart+"custom"); + partType=eval("form.part"+nPart); + if (partType.value === "CUSTOM" ) { + partTypeCustom=eval("form.part"+nPart+"custom"); logicalCode += " " + partTypeCustom.value; // Partición swap - if (partTypeCustom.value == "LINUX-SWAP") + if (partTypeCustom.value === "LINUX-SWAP") swapPart.push(nPart); } else { logicalCode += " " + partType.value; // Partición swap - if (partType.value == "LINUX-SWAP") + if (partType.value === "LINUX-SWAP") swapPart.push(nPart); } - var partSize=eval("form.size"+nPart); - if (partSize.value == "CUSTOM" ) { - var partSizeCustom=eval("form.size"+nPart+"custom"); + partSize=eval("form.size"+nPart); + if (partSize.value === "CUSTOM" ) { + partSizeCustom=eval("form.size"+nPart+"custom"); logicalCode += ":" + partSizeCustom.value; } else { logicalCode += ":" + partSize.value; @@ -270,17 +280,20 @@ partCode += " EMPTY:0"; } form.codigo.value="\ -" + sizecacheCode + " \n \ +ogEcho log session \"[0] $MSG_HELP_ogCreatePartitions "+n_disk+"\"\n \ ogEcho session \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\"\n \ ogUnmountAll "+n_disk+" 2>/dev/null \n \ ogUnmountCache \n \ +" + sizecacheCode + "\ ogEcho session \"[30] $MSG_HELP_ogUpdatePartitionTable "+n_disk+"\"\n \ ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ ogDeletePartitionTable "+n_disk+" \n \ ogUpdatePartitionTable "+n_disk+" \n \ " + cacheCode + "\ ogEcho session \"[70] $MSG_HELP_ogCreatePartitions " + partCode + "\"\n \ -if ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + "; then \n \ +ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + " \n \ +EVAL=$? \n \ +if [ $EVAL -eq 0 ]; then \n \ ogEcho session \"[80] $MSG_HELP_ogSetPartitionActive "+n_disk+" 1\"\n \ ogSetPartitionActive "+n_disk+" 1 \n \ ogEcho log session \"[90] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ @@ -290,7 +303,7 @@ if ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + "; then \n "+ swapCode +"\ else \n \ ogEcho session log \"[100] ERROR: $MSG_HELP_ogCreatePartitions\" \n \ - sleep 5 \n \ + return $EVAL \n \ fi"; } @@ -304,26 +317,25 @@ function codeParticionadoGPT (form) { var extended=false; var n_disk = form.n_disk.value; var tipo_part_table = form.tipo_part_table.value; - var swapPart = new Array(); + var swapPart = []; var swapCode = ""; - - numParts=document.getElementById("numGPTpartitions").value; + var numParts=document.getElementById("numGPTpartitions").value; for (var nPart=1; nPart <= numParts; nPart++) { var partCheck=eval("form.checkGPT"+nPart); if (partCheck.checked) { // Distinguimos entre cache y el resto de particiones // Solo tratamos la particion 4 como cache, si se selecciono este tipo - if(nPart == 4 && form.partGPT4.value == "CACHE") { - if (form.sizeGPT4.value == "0") { + if(nPart === 4 && form.partGPT4.value === "CACHE") { + if (form.sizeGPT4.value === "0") { sizecacheCode="\ -ogEcho session \"[20] $MSG_HELP_ogGetCacheSize\"\n \ -sizecache=`ogGetCacheSize` "; +ogEcho session \"[20] $MSG_HELP_ogGetCacheSize\" \n \ +sizecache=`ogGetCacheSize` \n "; cacheCode="\ ogEcho session \"[50] $MSG_HELP_ogCreateCache\"\n \ initCache "+ n_disk +" $sizecache NOMOUNT &>/dev/null \n "; } else { - if (form.sizeGPT4.value == "CUSTOM") { + if (form.sizeGPT4.value === "CUSTOM") { cacheSize = form.sizeGPT4custom.value; } else { cacheSize = form.sizeGPT4.value; @@ -336,20 +348,20 @@ initCache " + n_disk +" "+ cacheSize + " NOMOUNT &>/dev/null \n "; cacheCode += "ogExecAndLog command session ogListPartitions "+n_disk+" \n "; } else{ var partType=eval("form.partGPT"+nPart); - if (partType.value == "CUSTOM" ) { + if (partType.value === "CUSTOM" ) { var partTypeCustom=eval("form.partGPT"+nPart+"custom"); partCode += " " + partTypeCustom.value; // Partición swap - if (partTypeCustom.value == "LINUX-SWAP") - swapPart.push(nPart); + if (partTypeCustom.value === "LINUX-SWAP") + swapPart.push(nPart); } else { partCode += " " + partType.value; // Partición swap - if (partType.value == "LINUX-SWAP") - swapPart.push(nPart); + if (partType.value === "LINUX-SWAP") + swapPart.push(nPart); } var partSize=eval("form.sizeGPT"+nPart); - if (partSize.value == "CUSTOM" ) { + if (partSize.value === "CUSTOM" ) { var partSizeCustom=eval("form.sizeGPT"+nPart+"custom"); partCode += ":" + partSizeCustom.value; } else { @@ -369,24 +381,30 @@ initCache " + n_disk +" "+ cacheSize + " NOMOUNT &>/dev/null \n "; } form.codigo.value="\ -" + sizecacheCode + " \n \ -ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ ogEcho log session \"[0] $MSG_HELP_ogCreatePartitions "+n_disk+"\"\n \ ogEcho session \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\"\n \ ogUnmountAll "+n_disk+" \n \ ogUnmountCache \n \ +" + sizecacheCode + "\ ogEcho session \"[30] $MSG_HELP_ogUpdatePartitionTable "+n_disk+"\"\n \ +ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ ogDeletePartitionTable "+n_disk+" \n \ ogUpdatePartitionTable "+n_disk+" \n \ " + cacheCode + "\ ogEcho session \"[70] $MSG_HELP_ogCreatePartitions " + partCode + "\"\n \ -ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + " \n \ -ogEcho session \"[80] $MSG_HELP_ogSetPartitionActive "+n_disk+" 1\"\n \ -ogSetPartitionActive "+n_disk+" 1 \n \ -ogEcho log session \"[90] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ -ogUpdatePartitionTable "+n_disk+" \n \ -ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ -ogExecAndLog command session log ogListPartitions "+n_disk+" \n"; +ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + "\n \ +EVAL=$? \n \ +if [ $EVAL -eq 0 ]; then \n \ + ogEcho session \"[80] $MSG_HELP_ogSetPartitionActive "+n_disk+" 1\"\n \ + ogSetPartitionActive "+n_disk+" 1 \n \ + ogEcho log session \"[90] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ + ogUpdatePartitionTable "+n_disk+" \n \ + ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ + ogExecAndLog command session log ogListPartitions "+n_disk+" \n \ +else \n \ + ogEcho session log \"[100] ERROR: $MSG_HELP_ogCreatePartitions\" \n \ + return $EVAL \n \ +fi \n "; // Formateo de la swap form.codigo.value += swapCode; @@ -395,7 +413,7 @@ form.codigo.value += swapCode; function showPartitionForm (tipo_table_part) { document.getElementById("form"+tipo_table_part).style.display="inline"; - if(tipo_table_part == "MSDOS"){ + if(tipo_table_part === "MSDOS"){ // De los dos tipos, se oculta el otro document.getElementById("formGPT").style.display="none"; document.getElementById("warngpt").style.display="none"; @@ -419,10 +437,9 @@ function showPartitionForm (tipo_table_part) { function clickPartitionCheckbox (form, npart, isGPT) { // Si el parametro no esta definido, se toma como false isGPT = (isGPT)?isGPT:"false"; - if(isGPT == true){ + var prefix=""; + if(isGPT === true){ prefix="GPT"; - } else { - prefix=""; } var partCheck=eval("form.check"+prefix+npart); var partType=eval("form.part"+prefix+npart); @@ -434,27 +451,23 @@ function clickPartitionCheckbox (form, npart, isGPT) { if (partCheck.checked) { partType.disabled=false; partSize.disabled=false; - if(npart != 4){ - if (partType.options[partType.selectedIndex].value == "CUSTOM") { + if(npart !== 4){ + if (partType.options[partType.selectedIndex].value === "CUSTOM") { partTypeCustom.disabled=false; } } - if (partSize.options[partSize.selectedIndex].value == "CUSTOM") { - partSizeCustom.disabled=false; - } else { - partSizeCustom.disabled=true; - } + partSizeCustom.disabled = partSize.options[partSize.selectedIndex].value !== "CUSTOM"; } else { partType.disabled=true; partSize.disabled=true; // El campo TypeCustom no existe para la particion 4 - if(npart != 4) + if(npart !== 4) partTypeCustom.disabled=true; partSizeCustom.disabled=true; } if (npart <= 4) { // Si el formulario es GPT no hay extendidas - if(isGPT != true){ + if(isGPT !== true){ checkExtendedPartition(form); } calculateFreeDisk(form); @@ -479,12 +492,17 @@ function getMinDiskSize(disk){ // Calcula el tamaño de la mayor cache y lo guarda en un campo oculto function getMaxCacheSize() { var cacheSizeArray = document.getElementsByName("cachesize"); - var maxSize = cacheSizeArray[0].value; - for(var i= 1; i < cacheSizeArray.length; i++){ + // Si no existe cache el valor es cero. + if (cacheSizeArray[0]) { + var maxSize = cacheSizeArray[0].value; + for(var i= 1; i < cacheSizeArray.length; i++){ if(maxSize < cacheSizeArray[i].value) maxSize = cacheSizeArray[i].value; - } - document.getElementById("maxcachesize").value = maxSize; + } + document.getElementById("maxcachesize").value = maxSize; + } else { + document.getElementById("maxcachesize").value = 0; + } } @@ -492,7 +510,7 @@ function getMaxCacheSize() { function validaCache (freedisk) { var form = document.fdatos; var maxcachesize = parseInt(document.getElementById("maxcachesize").value); - if(form.part4.value === "CACHE" && form.check4.checked && form.size4.value == 0 ){ + if(form.part4.value === "CACHE" && form.check4.checked && form.size4.value === 0 ){ return ((freedisk - maxcachesize) > 0); } return true; @@ -501,7 +519,7 @@ function validaCache (freedisk) { // Código para calcular el espacio libre del disco. function calculateFreeDisk(form) { // Si esta seleccionada la opcion GPT, se llama a la funcion correspondiente - if(document.getElementById("tipo_part_table").value == "GPT"){ + if(document.getElementById("tipo_part_table").value === "GPT"){ calculateFreeGPTDisk(form); } // Capturamos el disco seleccionado @@ -517,7 +535,7 @@ function calculateFreeDisk(form) { var partSize=eval("form.size"+npart); var partSizeCustom=eval("form.size"+npart+"custom"); if (partCheck.checked) { - if (partSize.options[partSize.selectedIndex].value == "CUSTOM") { + if (partSize.options[partSize.selectedIndex].value === "CUSTOM") { freeDisk.value -= parseInt(partSizeCustom.value); } else { freeDisk.value -= parseInt(partSize.options[partSize.selectedIndex].value); @@ -531,7 +549,7 @@ function calculateFreeDisk(form) { freeDisk.style.fontWeight = "normal"; freeDisk.style.fontStyle = "normal"; } - if (form.size4.value == 0) { + if (form.size4.value === 0) { freeDisk.value += " (- cache)"; // Aviso de caché sin modificar. } } @@ -539,7 +557,7 @@ function calculateFreeDisk(form) { // Código para calcular el espacio libre del disco. en el formulario GPT function calculateFreeGPTDisk(form) { // Si esta seleccionada la opcion MSDOS, se llama a la funcion correspondiente - if(document.getElementById("tipo_part_table").value == "MSDOS"){ + if(document.getElementById("tipo_part_table").value === "MSDOS"){ calculateFreeDisk(form); } // Capturamos el disco seleccionado @@ -549,13 +567,13 @@ function calculateFreeGPTDisk(form) { var freeDisk=document.getElementById("freediskGPT"); // Capturamos el numero de particiones que hay hechas - numParts=document.getElementById("numGPTpartitions").value; - for (npart=1; npart<=numParts; npart++) { + var numParts=document.getElementById("numGPTpartitions").value; + for (var npart=1; npart<=numParts; npart++) { var partCheck=eval("form.checkGPT"+npart); var partSize=eval("form.sizeGPT"+npart); var partSizeCustom=eval("form.sizeGPT"+npart+"custom"); if (partCheck.checked) { - if (partSize.options[partSize.selectedIndex].value == "CUSTOM") { + if (partSize.options[partSize.selectedIndex].value === "CUSTOM") { freeDisk.value -= parseInt(partSizeCustom.value); } else { freeDisk.value -= parseInt(partSize.options[partSize.selectedIndex].value); @@ -569,7 +587,7 @@ function calculateFreeGPTDisk(form) { freeDisk.style.fontWeight = "normal"; freeDisk.style.fontStyle = "normal"; } - if (form.size4.value == 0) { + if (form.size4.value === 0) { freeDisk.value += " (- cache)"; // Aviso de caché sin modificar. } } @@ -603,28 +621,28 @@ function addGPTPartition(){ partitionTypes+='<OPTION value="BIOS-BOOT"> BIOS Boot </OPTION>'; - table = document.getElementById("particionesGPT"); + var table = document.getElementById("particionesGPT"); // Capturamos el numero de particiones, antes incrementamos document.getElementById("numGPTpartitions").value = parseInt(document.getElementById("numGPTpartitions").value)+1; - numPart=document.getElementById("numGPTpartitions").value; - partitionRow = table.insertRow(-1); + var numPart=document.getElementById("numGPTpartitions").value; + var partitionRow = table.insertRow(-1); partitionRow.id = "trPartition"+numPart; partitionRow.innerHTML="<td> \ <input type='checkbox' name='checkGPT"+numPart+"' value='checkGPT"+numPart+"' onclick='clickPartitionCheckbox(this.form, "+numPart+",true);' /> Partición "+numPart+"</td> \ <td>\ <select name='partGPT"+numPart+"' id='partGPT"+numPart+"' style='width:220' disabled='true' onclick=' \ - if (this.options[this.selectedIndex].value == \'CUSTOM\') { \ + if (this.options[this.selectedIndex].value === \"CUSTOM\") { \ this.form.partGPT"+numPart+"custom.disabled=false; \ } else { \ this.form.partGPT"+numPart+"custom.disabled=true; \ }'><option value='CUSTOM'> Personalizar </option> \ </select> \ <br> \ -<select name='partGPT"+numPart+"custom' id='partGPT"+numPart+"custom' style='width:220' disabled='true' >"+partitionTypes+"</select> \ +<select name='partGPT"+numPart+"custom' id='partGPT"+numPart+"custom' style='width:220px' disabled='true' >"+partitionTypes+"</select> \ </td> \ <td> \ -<select name='sizeGPT"+numPart+"' id='sizeGPT"+numPart+"' style='width:220' disabled='true' onclick=' \ - if (this.form.size"+numPart+".options[this.form.size"+numPart+".selectedIndex].value == \'CUSTOM\') { \ +<select name='sizeGPT"+numPart+"' id='sizeGPT"+numPart+"' style='width:220px' disabled='true' onclick=' \ + if (this.form.size"+numPart+".options[this.form.size"+numPart+".selectedIndex].value === \"CUSTOM\") { \ this.form.sizeGPT"+numPart+"custom.disabled=false; \ } else { \ this.form.sizeGPT"+numPart+"custom.disabled=true; \ @@ -632,19 +650,19 @@ function addGPTPartition(){ ' onchange='calculateFreeGPTDisk(this.form);'>0<option value='CUSTOM'> Personalizar </option> \ </select> \ <br /> \ -<input type='text' style='width:100' name='sizeGPT"+numPart+"custom' value='0' disabled='true' onchange='calculateFreeDisk(this.form);' /> \ +<input type='text' style='width:100px' name='sizeGPT"+numPart+"custom' value='0' disabled='true' onchange='calculateFreeDisk(this.form);' /> \ </td>" } // Agrega una nueva fila a la tabla de particiones con una nueva particion function deleteGPTPartition(){ - table = document.getElementById("particionesGPT"); + var table = document.getElementById("particionesGPT"); // Capturamos el numero de particiones - numPart=document.getElementById("numGPTpartitions").value; + var numPart=document.getElementById("numGPTpartitions").value; // Si ya solo quedan 4 particiones, no se elimina ni se decrementa el contador if(numPart > 4){ - partitionRow = document.getElementById("trPartition"+numPart); + var partitionRow = document.getElementById("trPartition"+numPart); table.deleteRow(partitionRow.rowIndex); // Decrementamos el numero de particiones document.getElementById("numGPTpartitions").value = parseInt(document.getElementById("numGPTpartitions").value)-1; @@ -655,21 +673,21 @@ function deleteGPTPartition(){ function checkExtendedPartition(form) { var logical=document.getElementById("logicas"); var visible=false; - for (npart=1; npart<=4; npart++) { + for (var npart=1; npart<=4; npart++) { var partCheck=eval("form.check"+npart); var partType=eval("form.part"+npart); var partTypeCustom=eval("form.part"+npart+"custom"); if (partCheck.checked) { partType.style.fontWeight = "normal"; - if (partType.value == "EXTENDED") { + if (partType.value === "EXTENDED") { visible=true; partType.style.fontWeight = "bold"; } // La particion 4 no tiene partTypeCustom - if(npart != 4){ - partTypeCustom.style.fontWeight = "normal"; - if (partType.value == "CUSTOM" && partTypeCustom.value == "EXTENDED") { + if(npart !== 4){ + partTypeCustom.style.fontWeight = "normal"; + if (partType.value === "CUSTOM" && partTypeCustom.value === "EXTENDED") { visible=true; partTypeCustom.style.fontWeight = "bold"; } |