frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #687 from billz/feature/metrics 

Exposes metric value in network interfaces
This commit is contained in:
Bill Zimmerman 2020-10-02 20:47:38 +02:00 committed by GitHub
parent 31b01e7704 466616e420
commit ac421dd9b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ajax/networking/gen_int_config.php
View File

@ -15,6 +15,9 @@ if (isset($_POST['generate'])) {
if ($cnfFile['static'] === 'true') { if ($cnfFile['static'] === 'true') {
$strConfFile .= "#Static IP configured for ".$cnfFile['interface']."\n"; $strConfFile .= "#Static IP configured for ".$cnfFile['interface']."\n";
$strConfFile .= "interface ".$cnfFile['interface']."\n"; $strConfFile .= "interface ".$cnfFile['interface']."\n";
if (isset($cnfFile['metric'])) {
$strConfFile .= "metric ".$cnfFile['metric']."\n";
}
$strConfFile .= "static ip_address=".$cnfFile['ip_address']."\n"; $strConfFile .= "static ip_address=".$cnfFile['ip_address']."\n";
$strConfFile .= "static routers=".$cnfFile['routers']."\n"; $strConfFile .= "static routers=".$cnfFile['routers']."\n";
$strConfFile .= "static domain_name_servers=".$cnfFile['domain_name_server']."\n\n"; $strConfFile .= "static domain_name_servers=".$cnfFile['domain_name_server']."\n\n";
@ -25,9 +28,12 @@ if (isset($_POST['generate'])) {
$strConfFile .= "static routers=".$cnfFile['routers']."\n"; $strConfFile .= "static routers=".$cnfFile['routers']."\n";
$strConfFile .= "static domain_name_servers=".$cnfFile['domain_name_server']."\n\n"; $strConfFile .= "static domain_name_servers=".$cnfFile['domain_name_server']."\n\n";
$strConfFile .= "interface ".$cnfFile['interface']."\n"; $strConfFile .= "interface ".$cnfFile['interface']."\n";
if (isset($cnfFile['metric'])) {
$strConfFile .= "metric ".$cnfFile['metric']."\n";
}
$strConfFile .= "fallback static_".$cnfFile['interface']."\n\n"; $strConfFile .= "fallback static_".$cnfFile['interface']."\n\n";
} else { } else {
$strConfFile .= "#DHCP configured for ".$cnfFile['interface']."\n\n"; $strConfFile .= "#DHCP configured for ".pathinfo($file, PATHINFO_FILENAME)."\n\n";
} }
} }
} }

1
ajax/networking/save_int_config.php
View File

@ -21,6 +21,7 @@ if (isset($_POST['interface'])) {
$cfg['domain_name_server'] = $dns1." ".$dns2; $cfg['domain_name_server'] = $dns1." ".$dns2;
$cfg['static'] = $_POST[$int.'-static']; $cfg['static'] = $_POST[$int.'-static'];
$cfg['failover'] = $_POST[$int.'-failover']; $cfg['failover'] = $_POST[$int.'-failover'];
$cfg['metric'] = $_POST[$int.'-metric'];
if (write_php_ini($cfg, RASPI_CONFIG_NETWORKING.'/'.$file)) { if (write_php_ini($cfg, RASPI_CONFIG_NETWORKING.'/'.$file)) {
$jsonData = ['return'=>0,'output'=>['Successfully Updated Network Configuration']]; $jsonData = ['return'=>0,'output'=>['Successfully Updated Network Configuration']];

3
locale/en_US/LC_MESSAGES/messages.po
View File

@ -490,6 +490,9 @@ msgstr "Disabled"
msgid "Static IP Options" msgid "Static IP Options"
msgstr "Static IP Options" msgstr "Static IP Options"
msgid "Metric"
msgstr "Metric"
msgid "Apply settings" msgid "Apply settings"
msgstr "Apply settings" msgstr "Apply settings"

8
templates/networking.php
View File

@ -141,10 +141,14 @@
<div class="form-group"> <div class="form-group">
<label for="<?php echo $if_quoted ?>-dnssvralt"><?php echo _("Alternate DNS Server") ?></label> <label for="<?php echo $if_quoted ?>-dnssvralt"><?php echo _("Alternate DNS Server") ?></label>
<input type="text" class="form-control" id="<?php echo $if_quoted ?>-dnssvralt" placeholder="0.0.0.0"> <input type="text" class="form-control" id="<?php echo $if_quoted ?>-dnssvralt" placeholder="0.0.0.0">
</div> </div>
<div class="form-group">
<label for="<?php echo $if_quoted ?>-metric"><?php echo _("Metric") ?></label>
<input type="text" class="form-control" id="<?php echo $if_quoted ?>-metric" placeholder="0">
</div>
<?php if (!RASPI_MONITOR_ENABLED) : ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<a href="#" class="btn btn-outline btn-primary intsave" data-int="<?php echo $if_quoted ?>"><?php echo _("Save settings") ?></a> <a href="#" class="btn btn-outline btn-primary intsave" data-int="<?php echo $if_quoted ?>"><?php echo _("Save settings") ?></a>
<a href="#" class="btn btn-warning intapply" data-int="<?php echo $if_quoted ?>"><?php echo _("Apply settings") ?></a> <a href="#" class="btn btn-warning intapply" data-int="<?php echo $if_quoted ?>"><?php echo _("Apply settings") ?></a>
<?php endif ?> <?php endif ?>
</form> </form>