From 37e57d1caa49c819dd10410ceb905c8cab26eab1 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sat, 2 May 2015 03:35:18 +0000
Subject: [PATCH] Status Graph: Auto-load first interface found.

---
 app/traffic_graph/app_languages.php |   8 ++
 app/traffic_graph/status_graph.php  | 115 ++++++++++++++--------------
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/app/traffic_graph/app_languages.php b/app/traffic_graph/app_languages.php
index 6d0304c090..3230ef3d0a 100644
--- a/app/traffic_graph/app_languages.php
+++ b/app/traffic_graph/app_languages.php
@@ -8,6 +8,14 @@ $text['title-traffic_graph']['pt-br'] = "Gráfico de tráfego";
 $text['title-traffic_graph']['pl'] = "Wykres przesyłu danych";
 $text['title-traffic_graph']['sv-se'] = "Trafik Graf";
 
+$text['message-no_interfaces_found']['en-us'] = "No interfaces found.";
+$text['message-no_interfaces_found']['es-cl'] = "Sin interfaces encontrados.";
+$text['message-no_interfaces_found']['pt-pt'] = "Sem interfaces encontrados.";
+$text['message-no_interfaces_found']['fr-fr'] = "Aucune interface trouvé.";
+$text['message-no_interfaces_found']['pt-br'] = "Sem interfaces encontrados.";
+$text['message-no_interfaces_found']['pl'] = "Nie znaleziono interfejsy.";
+$text['message-no_interfaces_found']['sv-se'] = "Inga gränssnitt hittades.";
+
 $text['label-interface']['en-us'] = "Interface";
 $text['label-interface']['es-cl'] = "Interfaz";
 $text['label-interface']['pt-pt'] = "Interface";
diff --git a/app/traffic_graph/status_graph.php b/app/traffic_graph/status_graph.php
index a8e7cb5a21..f504473a6b 100644
--- a/app/traffic_graph/status_graph.php
+++ b/app/traffic_graph/status_graph.php
@@ -71,71 +71,68 @@ require_once "resources/header.php";
 $document['title'] = $text['title-traffic_graph'];
 
 ?>
-<table cellpadding='0' cellspacing='0' border='0' width='100%'>
-<tr>
-<td align='left' valign='top'>
-	<p class="pgtitle"><b><?php echo $text['header-traffic_graph']?></b></p>
-</td>
-<td align='right' valign='top'>
-	<form name="form1" action="status_graph.php" method="get" style="">
-	<?php echo $text['label-interface']?>:
-	<select name="interface" class="formfld" style="width:100px; z-index: -10;" onchange="document.form1.submit()">
-	<option value=''></option>
-	<?php
-// run netstat to determine interface info
-	exec("netstat -i", $result_array);
-	//exec("netstat -i -nWb -f link", $result_array);
-
-//show the result array
-	//echo "<pre>\n";
-	//print_r($result_array);
-	//echo "</pre>\n";
-
-//parse the data into a named array
-	$x = 0;
-	foreach ($result_array as $key => $value) {
-		if ($value != "Kernel Interface table") {
-			if ($x == 0) {
-				//get the names of the values
-					$interface_name_info = preg_split("/\s+/", $result_array[1]);
-			}
-			else {
-				//get the values
-					$interface_value_info = preg_split("/\s+/", $result_array[$key]);
-				//list all the interfaces
-					if ($interface == $interface_value_info[0]) {
-						echo "<option value='".$interface_value_info[0]."' selected='selected'>".$interface_value_info[0]."</option>";
+<table cellpadding='0' cellspacing='0' border='0' align='right'>
+	<tr>
+		<td>
+			<?php
+			// run netstat to determine interface info
+				exec("netstat -i", $result_array);
+			//parse the data into a named array
+				$x = 0;
+				foreach ($result_array as $key => $value) {
+					if ($value != "Kernel Interface table") {
+						if ($x != 0) {
+							//get the values
+								$interface_info = preg_split("/\s+/", $result_array[$key]);
+							//list all the interfaces
+								$options[] = "<option value='".$interface_info[0]."' ".(($interface == $interface_info[0]) ? "selected='selected'" : null).">".htmlspecialchars($interface_info[0])."</option>";
+							//auto-select first interface
+								if ($interface == '') { $interface = $interface_info[0]; }
+						}
+						$x++;
 					}
-					else {
-						echo "<option value='".$interface_value_info[0]."'>".htmlspecialchars($interface_value_info[0])."</option>";
-					}
-			}
-			$x++;
-		}
-	}
-	?>
-	</select>
-	<input type='hidden' name='width' value='<?php echo $width; ?>'>
-	<input type='hidden' name='height' value='<?php echo $height; ?>'>
-	</form>
-</td>
-</tr>
+				}
+			//output form, if interfaces exist'
+				if (sizeof($options)) {
+					?>
+					<form name="form1" action="status_graph.php" method="get" style="">
+					<strong><?php echo $text['label-interface']?></strong>&nbsp;&nbsp;
+					<select name="interface" class="formfld" style="width: 100px; z-index: -10;" onchange="document.form1.submit()">
+						<?php echo implode("\n", $options); ?>
+					</select>
+					<input type='hidden' name='width' value='<?php echo $width; ?>'>
+					<input type='hidden' name='height' value='<?php echo $height; ?>'>
+					</form>
+					<?php
+				}
+			?>
+		</td>
+	</tr>
 </table>
-
+<b><?php echo $text['header-traffic_graph']?></b>
+<br><br>
 <?php echo $text['description-traffic_graph']?>
-
-<br />
-<br />
-<br />
-<br />
+<br><br>
 
 <div align="center">
-	<object data="svg_graph.php?interface=<?php echo $interface; ?>" type="image/svg+xml" width="<?php echo $width; ?>" height="<?php echo $height; ?>">
-		<param name="src" value="svg_graph.php?interface=<?php echo $interface; ?>" />
-		<?php echo $text['description-no_svg']?>
-	</object>
+	<br><br>
+	<?php
+	if (sizeof($options) > 0) {
+		?>
+		<object data="svg_graph.php?interface=<?php echo $interface; ?>" type="image/svg+xml" width="<?php echo $width; ?>" height="<?php echo $height; ?>">
+			<param name="src" value="svg_graph.php?interface=<?php echo $interface; ?>" />
+			<?php echo $text['description-no_svg']?>
+		</object>
+		<?php
+	}
+	else {
+		echo "<br><br><br><br><br>";
+		echo $text['message-no_interfaces_found'];
+		echo "<br><br><br><br><br>";
+	}
+	?>
 </div>
-<br><br>
+<br><br><br>
 
 <?php
 require_once "resources/footer.php";