diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-06-21 17:38:13 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-06-21 17:38:13 +0000 |
| commit | 3e321df2be59d2bb4c2ffd51e410fe120517e316 (patch) | |
| tree | 138e5336181e4a7e6d270301ea6208ad91e733bc /usr/local/www/widgets/widgets | |
| parent | fbb45bb034aad683b2bd207a497d0cfc0b1b5a1e (diff) | |
| download | pfsense-3e321df2be59d2bb4c2ffd51e410fe120517e316.zip pfsense-3e321df2be59d2bb4c2ffd51e410fe120517e316.tar.gz | |
Continue interface improvements
Diffstat (limited to 'usr/local/www/widgets/widgets')
3 files changed, 10 insertions, 14 deletions
diff --git a/usr/local/www/widgets/widgets/interface_statistics.widget.php b/usr/local/www/widgets/widgets/interface_statistics.widget.php index ad3f201..3fcf8a6 100644 --- a/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -36,10 +36,7 @@ require_once("pfsense-utils.inc"); require_once("functions.inc"); require_once("/usr/local/www/widgets/include/interface_statistics.inc"); - $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); - for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { - $ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr']; - } + $ifdescrs = get_configured_interface_with_descr(); $array_in_packets = array(); $array_out_packets = array(); @@ -213,4 +210,4 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); </tr> </table> </div> - </div>
\ No newline at end of file + </div> diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php index 8e687ca..5fe9d12 100644 --- a/usr/local/www/widgets/widgets/services_status.widget.php +++ b/usr/local/www/widgets/widgets/services_status.widget.php @@ -70,10 +70,11 @@ if(isset($config['captiveportal']['enable'])) { } $iflist = array("lan" => "LAN"); -for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { - $oc = $config['interfaces']['opt' . $i]; - if (isset($oc['enable']) && $oc['if'] && (!$oc['bridge'])) - $iflist['opt' . $i] = "opt{$i}"; +$ifdescrs = get_configured_interface_list(true); +foreach ($ifdescrs as $if) { + $oc = $config['interfaces'][$if]; + if ($oc['if'] && (!$oc['bridge'])) + $iflist[$if] = $if; } $show_dhcprelay = false; foreach($iflist as $if) { @@ -165,4 +166,4 @@ if($services) { echo "<tr><td colspan=\"4\"><center>No services found.</td></tr>\n"; } ?> -</table>
\ No newline at end of file +</table> diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php index dbeb3fd..3ff28da 100644 --- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -34,10 +34,8 @@ require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); require_once("functions.inc"); - $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); - for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { - $ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr']; - }?> + $ifdescrs = get_configured_interface_with_descr(); +?> <input type="hidden" id="traffic_graphs-config" name="traffic_graphs-config" value=""> <?php //set variables for traffic graph |
