WebSVN – ALCASAR – Diff – /web/acc/admin/network.php

 <?php
-# $Id: network.php 3287 2025-05-24 17:44:18Z rexy $
+# $Id: network.php 3288 2025-05-25 17:03:29Z rexy $
 // written by steweb57, Rexy, Tom HOUDAYER & Pierre RIVAULT
 /********************
 *  READ CONF FILES  *
 *********************/
 	$l_renew		= "Renouveller";
 	$l_renew_force		= "Renouveller (forcer)";
 	$l_previous_LE_cert	= "Revenir au certificat Let's Encrypt :";
 	$l_gw_weight    = "Poids";
 	$l_error        = "Erreur";
+	$l_error_bad_mac = "Adresse MAC invalide";
-	$l_error_bad_ip = "Ceci n'est pas une adresse IP valide";
+	$l_error_bad_ip = "Adresse IP invalide";
-	$l_error_bad_ip_CIDR = "Ceci n'est pas une adresse CIDR valide";
+	$l_error_bad_ip_CIDR = "Adresse IP au format CIDR invalide";
-	$l_error_bad_ip_port = "Ceci n'est pas une adresse IP + port valide";
+	$l_error_bad_ip_port = "Adresse IP + port invalide";
-	$l_error_weight = "Ceci n'est pas un poids valide";
+	$l_error_weight = "Poids invalide";
     $l_change_successful = "Changement effectué avec succès";
 } else if ($Language === 'es') {
 	$l_network_title	= "Configuración de Red";
 	$l_internet_legend	= "INTERNET";
 	$l_renew		= "Renovar";
 	$l_renew_force		= "Renovar (forzado)";
 	$l_previous_LE_cert	= "Volver al certificado de Let's Encrypt :";
     $l_gw_weight	= "Peso";
     $l_error		= "Error";
+	$l_error_bad_mac = "Dirección MAC no válida";
-    $l_error_bad_ip	= "Esta no es una dirección IP válida";
+    $l_error_bad_ip	= "Dirección IP inválida";
-    $l_error_bad_ip_CIDR	= "Esta no es una dirección CIDR válida";
+    $l_error_bad_ip_CIDR	= "Dirección IP no válida en formato CIDR";
-    $l_error_bad_ip_port	= "Esto no es una dirección IP + puerto válidos";
+    $l_error_bad_ip_port	= "Dirección IP + puerto no válidos";
-    $l_error_weight	= "Esto no es un peso válido";
+    $l_error_weight	= "Peso no válido";
     $l_change_successful	= "Cambio completado con éxito";
 } else {
 	$l_network_title	= "Network configuration";
 	$l_internet_legend	= "INTERNET";
 	$l_ip_mask		= "Mask";
 	$l_renew		= "Renew";
 	$l_renew_force		= "Renew (force)";
 	$l_previous_LE_cert	= "Back to the Let's Encrypt certificate :";
     $l_gw_weight = "Weight";
     $l_error        = "Error";
+	$l_error_bad_mac = "Invalid mac address";
-    $l_error_bad_ip = "This is not a valid IP";
+    $l_error_bad_ip = "Invalid IP address";
-    $l_error_bad_ip_CIDR = "This is not a valid CIDR IP";
+    $l_error_bad_ip_CIDR = "Invalid IP address in CIDR format";
-    $l_error_bad_ip_port = "This is not a valid IP + port";
+    $l_error_bad_ip_port = "Invalid IP address + port";
-    $l_error_weight = "This is not a valid weight";
+    $l_error_weight = "Invalid weight";
     $l_change_successful = "Network updated successfully";
+}
 $reg_ip      = '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/';
 $reg_ip_cidr = '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/';
 	<link rel="stylesheet" href="/css/acc.css" type="text/css">
 	<script src="/js/jquery.min.js"></script>
 	<script src="/js/jquery.connections.js"></script>
 	<script type="text/javascript">
 	function MAC_Control(formulaire){
-		// MAC control (hexadecimal upper case and '- or :' separator)
+		// MAC control syntax (hexadecimal upper case and '- or :' separator) + rewrite ":" in "-"
-		//var regex_mac = /^([0-9a-fA-F]{2}(-|:)){5}[0-9a-fA-F]{2}$/;
-		var regex_mac = /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/;
+		var regex_mac = <?= $reg_mac ?>;
 		if (regex_mac.test(document.forms[formulaire].add_mac.value)){
 			document.forms[formulaire].add_mac.value = document.forms[formulaire].add_mac.value.toUpperCase().replace(/:/g, '-');
 			return true;
 		} else {
+			alert('<?= $l_error_bad_mac ?>');
+			return false;
+		}
+	}
+	function IP_Control(formulaire){
+		// IP control (decimal & dot separator)
+		var regex_ip = <?= $reg_ip ?>;
+		if (regex_ip.test(document.forms[formulaire].add_ip.value)){
+			return true;
+		} else {
-			alert('Invalid MAC address');
+			alert('<?= $l_error_bad_ip ?>');
 			return false;
+		}
+	}
 	</script>
 	<style>
 <div class="panel">
 	<div class="panel-header"><?= $l_static_dhcp_title ?></div>
 </div>
 <table width="100%" cellspacing="0" cellpadding="5" border="1">
 	<tr><td width="50%" align="center" valign="middle">
-		<form action="network.php" method="POST">
+		<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
 		<table cellspacing="2" cellpadding="3" border="1">
 		<tr><th><?= $l_mac_address ?></th><th><?= $l_ip_address ?></th><th>Info<th><?= $l_del ?></th></tr>
 		<?php
 		// Read the "ether" file
 		exec('sudo /sbin/ip link show '.escapeshellarg($conf["INTIF"]), $output);
 			<input type="hidden" name="choix" value="del_mac">
 			<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_apply ?>">
 		<?php endif; ?>
 		</form>
 	</td><td width="50%" valign="middle" align="center">
-		<form name="new_mac" action="network.php" method="POST">
+		<form name="new_mac" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST" onSubmit="document.getElementById('ldoverlay').style.display='block';">
 			<table cellspacing="2" cellpadding="3" border="1">
 				<tr><th><?= $l_mac_address ?></th><th><?= $l_ip_address ?></th><th>Info</th><td></td></tr>
 				<tr><td>Ex. : 12-2F-36-A4-DF-43</td><td>Ex. : 192.168.182.10</td><td>Ex. : Switch<td></td></tr>
 				<tr><td><input type="text" name="add_mac" size="17"></td>
 				<td><input type="text" name="add_ip" size="10"></td>
 				<td><input type="text" name="info" size="10"></td>
 				<td>
 					<input type="hidden" name="choix" value="new_mac">
-					<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_add_to_list ?>" onclick="return MAC_Control('new_mac');">
+					<input type="submit" onClick="return (MAC_Control('new_mac') && IP_Control('new_mac'))" class="button" value="<?= $l_add_to_list ?>">
 				</td>
 			</tr></table>
 		</form>
 	</td></tr>
 </table>
+			}
 			?>
 			</table>
 			<?php if ($line_exist): ?>
 				<input type="hidden" name="choix" value="del_host">
-				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_apply ?>">
+				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_apply ?>">
 			<?php endif; ?>
 			</form>
 		</td>
 		<td width="50%" valign="middle" align="center">
-			<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+			<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST" onSubmit="document.getElementById('ldoverlay').style.display='block';">
 			<table cellspacing="2" cellpadding="3" border="1">
 			<tr>
 				<th><?= $l_ip_address ?></th><th><?= $l_host_name ?></th><td></td>
 			</tr>
 			<tr>
 				<td>Ex. : 192.168.182.10</td><td>Ex. : my_nas</td><td></td>
 			</tr>
 			<tr>
 				<td><input type="text" name="add_ip" size="10"><input type="hidden" name="choix" value="new_host"></td>
 				<td><input type="text" name="add_host" size="17"></td>
-				<td><input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_add_to_list ?>"></td>
+				<td><input type="submit" onClick="return (IP_Control('new_host'))" class="button" value="<?= $l_add_to_list ?>"></td>
 			</tr>
 			</table>
 			</form>
 		</td>
 	</tr>
 	<div class="panel-header"><?= $l_ssl_title ?></div>
 	<div class="panel-row">
 		<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
 			<input type="hidden" name="choix" value="https_login">
 			<input type="checkbox" name="https_login" id="https_login" <?= ($conf['HTTPS_LOGIN'] === 'on')? "checked": "" ?>><b><?= $l_ssl_title ?></b><br>
-			<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_apply ?>"><br>
+			<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_apply ?>"><br>
 		</form>
 	</div>
 </div>
 <br>
 <div class="panel">
 	<div class="panel-header"><?= $l_ssh_title ?></div>
 	<table width="100%" cellspacing="0" cellpadding="5" border="1">
 	<tr>
 		<td width="50%" align="center">
 			<div class="panel-row">
-				<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
+				<form name="ssh_lan" method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
 					<input type="hidden" name="choix" value="enable_lan_ssh">
 					<input type="checkbox" name="sshlan" id="sshlan" <?= $conf['SSH_LAN'] !== '0' ? "checked": "" ?> onchange="document.getElementById('sshtablelan').style.display = this.checked ? 'block' : 'none';"> <b><?= $l_ssh_lan_activate ?></b><br><br>
 					<div id="sshtablelan" style="display:<?= $conf['SSH_LAN'] !== '0'? "block": "none" ?>">
 					<table cellspacing="2" cellpadding="3" border="1">
 						<tr>
 							<td><input style="width:120px" type="text" id="ssh_from" name="ssh_from" value="<?= explode('/',$conf['SSH_ADMIN_FROM'])[0] ?>" /></td>
 						</tr>
 					</table>
 					<p><?= $l_all_ip ?></p>
 				</div>
-					<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_apply ?>"><br>
+					<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_apply ?>"><br>
 				</form>
 			</div>
 		</td>
 		<td width="50%" align="center">
 			<div class="panel-row">
-				<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
+				<form name="ssh_wan" method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>">
 				<input type="hidden" name="choix" value="enable_wan_ssh">
 				<input type="checkbox" name="togglessh" id="togglessh" <?= $conf['SSH_WAN'] !== '0'? "checked": "" ?> onchange="document.getElementById('sshtablewan').style.display = this.checked ? 'block' : 'none';"> <b><?= $l_ssh_wan_activate ?></b><br><br>
 				<div id="sshtablewan" style="display:<?= $conf['SSH_WAN'] !== '0'? "block": "none" ?>">
 					<table cellspacing="2" cellpadding="3" border="1">
 						<tr>
 							<td><input style="width:120px" type="text" id="ssh_from" name="ssh_from" value="<?= explode('/',$conf['SSH_ADMIN_FROM'])[1] ?>" /></td>
 						</tr>
 					</table>
 					<p><?= $l_all_ip ?></p>
 				</div>
-				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_apply ?>"><br>
+				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_apply ?>"><br>
 				</form>
 			</div>
 		</td>
 	</tr>
 	</table>
 			<form method="post" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" enctype="multipart/form-data">
 				<?= $l_private_key;?> <input type="file" name="key"><br>
 				<?= $l_certificate;?> <input type="file" name="crt"><br>
 				<?= $l_server_chain;?> <input type="file" name="sc"><br>
 				<input type="hidden" name="choix" value="import_cert">
-				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" value="<?= $l_import ?>">
+				<input type="submit" onClick="document.getElementById('ldoverlay').style.display='block';" class="button" value="<?= $l_import ?>">
 			</form>
 		</div>
 		<div class="panel-cell">
 			<?php
 			// Get step

Subversion Repositories ALCASAR

(root)/web/acc/admin/network.php – Rev 3287 → 3288