diff --git a/html/input.php b/html/input.php
index 955e7c9..89ead82 100755
--- a/html/input.php
+++ b/html/input.php
@@ -458,17 +458,11 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
| No |
- ID |
- Service Name |
- Input |
- Output |
- Video |
- Audio |
- Resolution |
- V-Bitrate |
- A-Bitrate |
- Volume (dB) |
Status |
+ Service Name |
+ UDP |
+ Video Info |
+ Audio Info |
Actions |
@@ -477,19 +471,36 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
| = $i++ ?> |
- = $row['id'] ?> |
- = $row["service_name"] ?> |
- = $row["input_udp"] ?> |
- = $row["output_udp"] ?> |
- = $row["video_format"] ?> |
- = $row["audio_format"] ?> |
- = $row["resolution"] ?> |
- = $row["video_bitrate"] ?> |
- = $row["audio_bitrate"] ?> |
- = $row["volume"] ?> dB |
- = $row["service"] ?> |
- |
+ = $row["service_name"] ?> |
+
+ In: = $row["input_udp"] ?>
+ Out: = $row["output_udp"] ?>
+ |
+
+
+ Video: = $row["video_format"] ?>
+ Resolution: = $row["resolution"] ?>
+ Bitrate: = $row["video_bitrate"] ?> kbps
+
+ |
+
+
+ Audio: = $row["audio_format"] ?>
+ Bitrate: = $row["audio_bitrate"] ?> kbps
+ Volume: = $row["volume"] ?> dB
+
+ |
+
+
@@ -524,7 +535,7 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
@@ -568,7 +579,7 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
document.getElementById('out_udp').value = '';
document.getElementById('video_format').value = 'mpeg2video';
document.getElementById('audio_format').value = 'mp2';
- document.getElementById('resolution').value = '720x480';
+ document.getElementById('resolution').value = '720x576';
document.getElementById('video_bitrate').value = '2048';
document.getElementById('audio_bitrate').value = '128';
document.getElementById('volume').value = '0';
@@ -586,7 +597,7 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
document.getElementById('out_udp').value = serviceData.output_udp || '';
document.getElementById('video_format').value = serviceData.video_format || 'mpeg2video';
document.getElementById('audio_format').value = serviceData.audio_format || 'mp2';
- document.getElementById('resolution').value = serviceData.resolution || '720x480';
+ document.getElementById('resolution').value = serviceData.resolution || '720x576';
document.getElementById('video_bitrate').value = serviceData.video_bitrate || '2048';
document.getElementById('audio_bitrate').value = serviceData.audio_bitrate || '128';
document.getElementById('volume').value = serviceData.volume || '0';
@@ -646,7 +657,7 @@ file_put_contents($jsonFile, json_encode($data, JSON_PRETTY_PRINT));
form.submit();
}
}
-
+
document.getElementById('saveBtn').addEventListener('click', function() {
const id = document.getElementById('service_id').value;
const serviceData = {
diff --git a/html/network.php b/html/network.php
index 1d09b62..3bee05a 100755
--- a/html/network.php
+++ b/html/network.php
@@ -28,7 +28,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if ($action === 'save') {
// Save configuration
$config = [
- 'interface' => $interface,
+ 'interface_nickname' => $_POST['interface_nickname'] ?? $interface,
'method' => $_POST['method'] ?? '',
'ip' => $_POST['ip'] ?? '',
'gateway' => $_POST['gateway'] ?? '',
@@ -66,14 +66,14 @@ function generate_netplan_config($config)
$netplan_content = "network:\n version: 2\n ethernets:\n";
- foreach ($config as $interface => $settings) {
+ foreach ($config as $interface_name => $settings) {
// Skip virtual interfaces and loopback
if (
- strpos($interface, 'enx') === 0 ||
- strpos($interface, 'docker') === 0 ||
- strpos($interface, 'br-') === 0 ||
- strpos($interface, 'veth') === 0 ||
- $interface === 'lo'
+ strpos($interface_name, 'enx') === 0 ||
+ strpos($interface_name, 'docker') === 0 ||
+ strpos($interface_name, 'br-') === 0 ||
+ strpos($interface_name, 'veth') === 0 ||
+ $interface_name === 'lo'
) {
continue;
}
@@ -83,7 +83,8 @@ function generate_netplan_config($config)
continue;
}
- $netplan_content .= " $interface:\n";
+ // Use actual interface name for netplan configuration
+ $netplan_content .= " $interface_name:\n";
switch ($settings['method']) {
case 'dhcp':
@@ -240,7 +241,7 @@ $selected_interface = $_GET['interface'] ?? array_keys($interface_data)[0] ?? nu
@@ -265,10 +266,10 @@ $selected_interface = $_GET['interface'] ?? array_keys($interface_data)[0] ?? nu
-
-
+
+
|