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

 <?php
-# $Id: network.php 2688 2019-01-18 23:15:49Z lucas.echard $
+# $Id: network.php 2708 2019-03-05 23:17:43Z tom.houdayer $
 // written by steweb57, Rexy & Tom HOUDAYER
 /********************
 *  READ CONF FILES  *
 	$l_dhcp_state		= "Mode actuel";
 	$l_DHCP_on		= "actif";
 	$l_DHCP_off		= "inactif";
 	$l_DHCP_off_explain	= "/!\\ Avant d'arrêter le serveur DHCP, vous devez renseigner les paramètres d'un serveur externe (cf. documentation).";
 	$l_static_dhcp_title	= "Réservation d'adresses IP statiques";
+	$l_dhcp_relay		= "Relais DHCP";
+	$l_dhcp_relay_local_ip	= "Adresse IP locale";
+	$l_dhcp_relay_ip	= "Adresse IP DHCP";
+	$l_dhcp_relay_port	= "Port DHCP";
 	$l_mac_address		= "Adresse MAC";
 	$l_ip_address		= "Adresse IP";
 	$l_host_name		= "Nom d'hôte";
 	$l_del			= "Supprimer de la liste";
 	$l_add_to_list		= "Ajouter";
 	$l_dhcp_state		= "Current mode";
 	$l_DHCP_on		= "enabled";
 	$l_DHCP_off		= "disabled";
 	$l_DHCP_off_explain	= "/!\\ Before disabling the DHCP server, you must write the extern DHCP parameters in the config file (see Documentation)";
 	$l_static_dhcp_title	= "Static IP addresses reservation";
+	$l_dhcp_relay		= "DHCP relay";
+	$l_dhcp_relay_local_ip	= "Locale IP address";
+	$l_dhcp_relay_ip	= "DHCP IP address";
+	$l_dhcp_relay_port	= "DHCP port";
-	$l_mac_address		= "MAC Address";
+	$l_mac_address		= "MAC address";
-	$l_ip_address		= "IP Address";
+	$l_ip_address		= "IP address";
+	$l_port			= "Port";
 	$l_host_name		= "Host name";
 	$l_del			= "Delete from list";
 	$l_add_to_list		= "Add";
 	$l_apply		= "Apply changes";
 	$l_local_dns		= "Local name resolution";
 $choix = (isset($_POST['choix'])) ? $_POST['choix'] : '';
 switch ($choix) {
 	case 'DHCP_On':
 		exec('sudo /usr/local/bin/alcasar-dhcp.sh -on');
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
 	case 'DHCP_Off':
 		exec('sudo /usr/local/bin/alcasar-dhcp.sh -off');
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
 	case 'new_mac':
 		$new_mac_addr = trim($_POST['add_mac']);
 		$new_ip_addr  = trim($_POST['add_ip']);
 		if (((!empty($new_mac_addr)) && (preg_match($reg_mac, $new_mac_addr))) && ((!empty($new_ip_addr)) && (preg_match($reg_ip, $new_ip_addr)))) {
 					fclose($pointeur);
 					exec('sudo /usr/bin/systemctl reload chilli');
+				}
+			}
+		}
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
 	case 'del_mac':
 		foreach ($_POST as $key => $value) {
 			if ($value == 'on') {
 				$ether_file = ETHERS_FILE;
 				$ether_file_info = ETHERS_INFO_FILE;
 				exec("/bin/sed -i ".escapeshellarg("/^$key/d")." $ether_file");
 				exec("/bin/sed -i ".escapeshellarg("/^$key/d")." $ether_file_info");
 				exec('sudo /usr/bin/systemctl reload chilli');
+			}
+		}
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
+	case 'dhcp_relay':	// DHCP relay
+		// TODO : check DHCP relay before apply?
+		file_put_contents(CONF_FILE, str_replace('EXT_DHCP_IP='.$conf['EXT_DHCP_IP'],         'EXT_DHCP_IP='.trim($_POST['dhcp_relay_ext_ip']),   file_get_contents(CONF_FILE)));
+		file_put_contents(CONF_FILE, str_replace('RELAY_DHCP_IP='.$conf['RELAY_DHCP_IP'],     'RELAY_DHCP_IP='.trim($_POST['dhcp_relay_ip']),     file_get_contents(CONF_FILE)));
+		file_put_contents(CONF_FILE, str_replace('RELAY_DHCP_PORT='.$conf['RELAY_DHCP_PORT'], 'RELAY_DHCP_PORT='.trim($_POST['dhcp_relay_port']), file_get_contents(CONF_FILE)));
+		header('Location: '.$_SERVER['PHP_SELF']);
+		exit();
 	case 'new_host':
 		$add_host = trim($_POST['add_host']);
 		$add_ip   = trim($_POST['add_ip']);
 		if (((!empty($add_host)) && (preg_match($reg_host, $add_host))) && ((!empty($add_ip)) && (preg_match($reg_ip, $add_ip)))) {
 				if ($insert) {
 					exec("sudo /usr/local/bin/alcasar-dns-local.sh --add $add_ip $add_host");
+				}
+			}
+		}
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
 	case 'del_host':
 		foreach ($_POST as $key => $value) {
 			if ($value == 'on') {
 				$del_host = explode ("|", $key);
 				$del_ip = str_replace("_",".",$del_host[0]);
 				exec("sudo /usr/local/bin/alcasar-dns-local.sh --del $del_ip $del_host[1]");
+			}
+		}
+		header('Location: '.$_SERVER['PHP_SELF']);
-		break;
+		exit();
 	case 'default_cert':	// Restore default certificate
 		exec('sudo alcasar-importcert.sh -d');
 		break;
 		<input type="submit" value="<?= $l_apply ?>">
 		<br><?= $l_DHCP_off_explain ?>
 	</form>
 	</td></tr>
-	<?php
-	if ($conf['DHCP'] === 'on') {
+<?php if ($conf['DHCP'] === 'on'): ?>
-		require('network2.php');
-	}
-	?>
-</table>
-<br>
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr><th><?= $l_local_dns?></th></tr>
-	<tr bgcolor="#FFCC66"><td><img src="/images/pix.gif" width="1" height="2"></td></tr>
+	<tr><td colspan="2" align="center"><?= $l_static_dhcp_title ?></td></tr>
-</table>
-<table width="100%" cellspacing="0" cellpadding="5" border="1">
-<tr>
-	<td width="50%" align="center">
+	<tr><td width="50%" align="center" valign="middle">
-		<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+		<form action="network.php" method="POST">
 		<table cellspacing="2" cellpadding="3" border="1">
-		<tr><th><?= $l_ip_address ?></th><th><?= $l_host_name ?></th><th><?= $l_del ?></th></tr>
+		<tr><th><?= $l_mac_address ?></th><th><?= $l_ip_address ?></th><th>Info<th><?= $l_del ?></th></tr>
 		<?php
-		// Read the "dns_local" file
+		// Read the "ether" file
+		exec('sudo /sbin/ip link show '.escapeshellarg($conf["INTIF"]), $output);
+		$detail = explode(' ', $output[1]);
+		$intif_mac_addr = strtoupper(str_replace(':', '-', $detail[5]));
+		unset($output); unset($detail);
 		$line_exist = false;
-		$tab = file(DNS_LOCAL_FILE);
+		$tab = file(ETHERS_INFO_FILE);
-		if ($tab) { // not empty
+		if ($tab) { // le fichier n'est pas vide
 			foreach ($tab as $line) {
-				if (preg_match ('/^\d+/', $line)) { # begin with one or several digit
+				$fields = explode(' ', $line);
-					$line_exist = true;
+				$mac_addr = $fields[0];
-					$field = preg_split("/\s+/",$line); # split with one or several whitespace (or tab)
-					$ip_addr   = $field[0];
+				$ip_addr  = $fields[1];
-					$host_name = $field[1];
+				$info     = (isset($fields[2])) ? $fields[2] : ' ';
+				echo '<tr>';
-					echo "<tr><td>$ip_addr</td>";
+				echo "<td>$mac_addr</td>";
-					echo "<td>$host_name</td>";
+				echo "<td>$ip_addr</td>";
-					if (($ip_addr == "127.0.0.1")|($host_name == "alcasar")) {
+				if ($mac_addr !== $intif_mac_addr) {
-						echo "<td>";}
+					echo '<td>'.ltrim($info, '#').'</td>';
-					else {
-						echo "<td><input type=\"checkbox\" name=\"$ip_addr|$host_name\">";
+					echo "<td><input type=\"checkbox\" name=\"$mac_addr\"></td>";
+					$line_exist=True;
-					}
+				} else {
+					echo '<td>ALCASAR</td>';
-					echo "</td></tr>";
+					echo '<td></td>';
+				}
+				echo '</tr>';
+			}
+		}
-		if (!$line_exist) {
-			echo '<tr><td colspan="3" style="text-align: center;font-style: italic;">'.$l_empty.'</td></tr>';
-		}
 		?>
 		</table>
 		<?php if ($line_exist): ?>
-			<input type="hidden" name="choix" value="del_host">
+			<input type="hidden" name="choix" value="del_mac">
 			<input type="submit" value="<?= $l_apply ?>">
 		<?php endif; ?>
 		</form>
-	</td>
-	<td width="50%" valign="middle" align="center">
+	</td><td width="50%" valign="middle" align="center">
-		<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+		<form name="new_mac" action="network.php" method="POST">
-		<table cellspacing="2" cellpadding="3" border="1">
+			<table cellspacing="2" cellpadding="3" border="1">
-		<tr>
-			<th><?= $l_ip_address ?></th><th><?= $l_host_name ?></th><td></td>
+				<tr><th><?= $l_mac_address ?></th><th><?= $l_ip_address ?></th><th>Info</th><td></td></tr>
-		</tr>
-		<tr>
-			<td>Ex. : 192.168.182.10</td><td>Ex. : my_nas</td><td></td>
+				<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>
-		</tr>
+				<td><input type="text" name="info" size="10"></td>
-		<tr>
+				<td>
-			<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>
+					<input type="hidden" name="choix" value="new_mac">
-			<td><input type=submit class=button value="<?= $l_add_to_list ?>"></td>
+					<input type="submit" class="button" value="<?= $l_add_to_list ?>" onclick="return MAC_Control('new_mac');">
-		</tr>
+				</td>
-		</table>
+			</tr></table>
 		</form>
+	</td></tr>
+<?php else: ?>
+	<tr><td colspan="2" align="center"><?= $l_dhcp_relay ?></td></tr>
+	<tr>
+		<td colspan="2" align="center">
+			<form name="new_host" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+			<table cellspacing="2" cellpadding="3" border="1">
+			<tr>
+				<th><label for="dhcp_relay_ip"><?= $l_dhcp_relay_local_ip ?></label></th><td><input type="text" name="dhcp_relay_ip" id="dhcp_relay_ip" value="<?= $conf['RELAY_DHCP_IP'] ?>" size="32"></td>
+			</tr>
+			<tr>
+				<th><label for="dhcp_relay_ext_ip"><?= $l_dhcp_relay_ip ?></label></th><td><input type="text" name="dhcp_relay_ext_ip" id="dhcp_relay_ext_ip" value="<?= $conf['EXT_DHCP_IP'] ?>" size="32"></td>
+			</tr>
+			<tr>
+				<th><label for="dhcp_relay_port"><?= $l_dhcp_relay_port ?></label></th><td><input type="text" name="dhcp_relay_port" id="dhcp_relay_port" value="<?= $conf['RELAY_DHCP_PORT'] ?>" size="32"></td>
+			</tr>
+			</table>
+			<input type="hidden" name="choix" value="dhcp_relay">
+			<input type="submit" value="<?= $l_apply ?>">
+			</form>
-	</td>
+		</td>
-</tr>
+	</tr>
+<?php endif; ?>
 </table>
 <br>
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr><th><?= $l_ssl_title ?></th></tr>

Subversion Repositories ALCASAR

(root)/web/acc/admin/network.php – Rev 2688 → 2708