diff options
Diffstat (limited to 'src')
44 files changed, 118 insertions, 91 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 88d2b86..3e41d49 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -742,9 +742,10 @@ function interface_lagg_configure($lagg) { $smallermtu = 0; foreach ($members as $member) { $mtu = get_interface_mtu($member); - if ($smallermtu == 0 && !empty($mtu)) { - $smallermtu = $mtu; - } else if (!empty($mtu) && $mtu < $smallermtu) { + if (empty($mtu)) { + continue; + } + if ($smallermtu == 0 || $mtu < $smallermtu) { $smallermtu = $mtu; } } @@ -5073,8 +5074,8 @@ function interface_find_child_cfgmtu($realiface) { } } if (is_array($gifs)) { - foreach ($gifs as $vlan) { - $ifass = convert_real_interface_to_friendly_interface_name($vlan['gifif']); + foreach ($gifs as $gif) { + $ifass = convert_real_interface_to_friendly_interface_name($gif['gifif']); if (empty($ifass)) { continue; } @@ -5086,8 +5087,8 @@ function interface_find_child_cfgmtu($realiface) { } } if (is_array($gres)) { - foreach ($gres as $vlan) { - $ifass = convert_real_interface_to_friendly_interface_name($vlan['greif']); + foreach ($gres as $gre) { + $ifass = convert_real_interface_to_friendly_interface_name($gre['greif']); if (empty($ifass)) { continue; } diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 2ce7421..536bb45 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -147,8 +147,12 @@ _exit() { local _rc=${1:-"0"} # If EVENT_PIPE is defined, GUI is calling - [ -n "${progress_socket}" ] \ - && _echo "__RC=${_rc}" + if [ -n "${progress_socket}" ]; then + local _need_reboot_str="" + [ -n "${need_reboot}" ] \ + && _need_reboot_str=" __REBOOT_AFTER=${reboot_after}" + _echo "__RC=${_rc}${_need_reboot_str}" + fi exit ${_rc} } @@ -646,11 +650,15 @@ pkg_reinstall_all() { } do_reboot() { - _echo "Upgrade is complete. Rebooting in 10 seconds." - echo "Upgrade is complete. Rebooting in 10 seconds." | wall - /etc/rc.notify_message -e -g -m "Upgrade is complete. Rebooting in 10 seconds." if [ -z "${dont_reboot}" ]; then - (sleep 10 && /etc/rc.reboot) & + _echo "Upgrade is complete. Rebooting in ${reboot_after} seconds." + echo "Upgrade is complete. Rebooting in ${reboot_after} seconds." | wall + /etc/rc.notify_message -e -g -m "Upgrade is complete. Rebooting in ${reboot_after} seconds." + (sleep ${reboot_after} && /etc/rc.reboot) & + else + _echo "Upgrade is complete." + echo "Upgrade is complete." | wall + /etc/rc.notify_message -e -g -m "Upgrade is complete." fi } @@ -687,6 +695,9 @@ export chroot_dir="" # Save nc_pid to be able to kill it export nc_pid="" +# Reboot after 10 seconds +export reboot_after=10 + unset dry_run unset dont_reboot unset booting diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 13777d4..70cfd68 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -207,7 +207,7 @@ print $form; <td><?= $state ?></td> <td> - <a class="btn fa fa-times" data-entry="<?=$srcip?>|<?=$dstip?>" + <a class="btn fa fa-trash" data-entry="<?=$srcip?>|<?=$dstip?>" title="<?=sprintf(gettext('Remove all state entries from %s to %s'), $srcip, $dstip);?>"></a> </td> </tr> diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 2e62fba..9dc8fd5 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -120,7 +120,7 @@ $tab_array[] = array(gettext("NPt"), true, "firewall_nat_npt.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('NPt mappings')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('NPt Mappings')?></h2></div> <div class="panel-body"> <div class="table responsive"> <form method="post"> @@ -131,7 +131,7 @@ display_top_tabs($tab_array); <th><?=gettext("External Prefix")?></th> <th><?=gettext("Internal prefix")?></th> <th><?=gettext("Description")?></th> - <th><!-- Buttons --></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody class="user-entries"> @@ -167,8 +167,8 @@ foreach ($a_npt as $natent): <?=htmlspecialchars($natent['descr'])?> </td> <td> - <a href="firewall_nat_npt_edit.php?id=<?=$i?>" class="btn btn-xs btn-info"><?=gettext("Edit")?></a> - <a href="firewall_nat_npt.php?act=del&id=<?=$i?>" class="btn btn-xs btn-danger"><?=gettext("Delete")?></a> + <a class="fa fa-pencil" title="<?=gettext("Edit"); ?>" href="firewall_nat_npt_edit.php?id=<?=$i?>"></a> + <a class="fa fa-trash" title="<?=gettext("Delete")?>" href="firewall_nat_npt.php?act=del&id=<?=$i?>"></a> </td> </tr> <?php diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index 0f4ba12..c44a53a 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -126,7 +126,7 @@ if ($savemsg) { <th><?=gettext("Name")?></th> <th><?=gettext("Range: Date / Times / Name")?></th> <th><?=gettext("Description")?></th> - <th><!--Buttons--></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index 3c5d0c8..ccfaf92 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -296,7 +296,7 @@ display_top_tabs($tab_array); <th><?=gettext("Interface")?></th> <th><?=gettext("Type")?></th> <th><?=gettext("Description")?></th> - <th><!--Buttons--></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index 6dc9c2f..3498713 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -127,16 +127,16 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Bridge interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Bridge Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Interface"); ?></th> - <th><?=gettext("Members"); ?></th> - <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Interface"); ?></th> + <th><?=gettext("Members"); ?></th> + <th><?=gettext("Description"); ?></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index f4048d7..5e939e6 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -122,7 +122,7 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('GIF interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('GIF Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> @@ -131,7 +131,7 @@ display_top_tabs($tab_array); <th><?=gettext("Interface"); ?></th> <th><?=gettext("Tunnel to …"); ?></th> <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index e22a908..76da5dc 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -122,7 +122,7 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('GRE interfacess')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('GRE Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> @@ -131,7 +131,7 @@ display_top_tabs($tab_array); <th><?=gettext("Interface"); ?></th> <th><?=gettext("Tunnel to …"); ?></th> <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index 39d5571..a4972b2 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -104,7 +104,7 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Interface groups')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Interface Groups')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> @@ -113,7 +113,7 @@ display_top_tabs($tab_array); <th><?=gettext('Name');?></th> <th><?=gettext('Members');?></th> <th><?=gettext('Description');?></th> - <th></th> + <th><?=gettext('Actions');?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index ff6e01b..3deecdc 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -220,7 +220,7 @@ $tab_array[10] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); $form = new Form; -$section = new Form_Section('Interface Group Edit'); +$section = new Form_Section('Interface Group Configuration'); $section->addInput(new Form_Input( 'ifname', diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index 84c5abd..2138cc6 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -129,16 +129,16 @@ $tab_array[] = array(gettext("LAGG"), true, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('LAGG interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('LAGG Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Interface"); ?></th> - <th><?=gettext("Members"); ?></th> - <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Interface"); ?></th> + <th><?=gettext("Members"); ?></th> + <th><?=gettext("Description"); ?></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index e4623ab..d30309c 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -121,16 +121,16 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('PPPS interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('PPP Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Interface"); ?></th> - <th><?=gettext("Interface(s)/Port(s)"); ?></th> - <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Interface"); ?></th> + <th><?=gettext("Interface(s)/Port(s)"); ?></th> + <th><?=gettext("Description"); ?></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index 0233eed..95c3137 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -550,7 +550,7 @@ $linkparamstr = gettext('Bandwidth is set only for MLPPP connections and when li $form = new Form(); -$section = new Form_Section('PPPs Configuration'); +$section = new Form_Section('PPP Configuration'); $section->addInput(new Form_Select( 'type', diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index ebdd0a2..12289e9 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -134,17 +134,17 @@ display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('QinQ interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('QinQ Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Interface"); ?></th> - <th><?=gettext("Tag");?></td> - <th><?=gettext("QinQ members"); ?></th> - <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Interface"); ?></th> + <th><?=gettext("Tag");?></th> + <th><?=gettext("QinQ members"); ?></th> + <th><?=gettext("Description"); ?></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index 9d98573..3a198d8 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -261,7 +261,7 @@ $form = new Form(new Form_Button( gettext("Save") )); -$section = new Form_Section('Interface QinQ Edit'); +$section = new Form_Section('QinQ Configuration'); $section->addInput(new Form_Select( 'if', diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index c3ea2f8..8c505e3 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -131,7 +131,7 @@ display_top_tabs($tab_array); <input id="id" type="hidden" name="id" value=""/> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('VLAN interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('VLAN Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> @@ -141,7 +141,7 @@ display_top_tabs($tab_array); <th><?=gettext('VLAN tag');?></th> <th><?=gettext('Priority');?></th> <th><?=gettext('Description');?></th> - <th></th> + <th><?=gettext('Actions');?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index 42258e7..b5f6794 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -208,7 +208,7 @@ if ($input_errors) { } $form = new Form; -$section = new Form_Section('Interface VLAN Edit'); +$section = new Form_Section('VLAN Configuration'); $section->addInput(new Form_Select( 'if', diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index d6c9489..8dd6318 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -126,16 +126,16 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Wireless interfaces')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Wireless Interfaces')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Interface"); ?></th> - <th><?=gettext("Mode"); ?></th> - <th><?=gettext("Description"); ?></th> - <th></th> + <th><?=gettext("Interface"); ?></th> + <th><?=gettext("Mode"); ?></th> + <th><?=gettext("Description"); ?></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 07e0d08..d920cd7 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -207,7 +207,7 @@ if ($input_errors) { $form = new Form(); -$section = new Form_Section('Wireless Interface'); +$section = new Form_Section('Wireless Interface Configuration'); $section->addInput(new Form_Select( 'parent', diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index 89251ee..8248cf0 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -140,7 +140,7 @@ display_top_tabs($tab_array); <th><?=gettext('Name')?></th> <th><?=gettext('Type')?></th> <th><?=gettext('Description')?></th> - <th><?=gettext('Action')?></th> + <th><?=gettext('Actions')?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index cb82855..eac075d 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -157,7 +157,7 @@ display_top_tabs($tab_array); <th><?=gettext('Port')?></th> <th><?=gettext('Monitor')?></th> <th><?=gettext('Description')?></th> - <th></th> + <th><?=gettext('Actions')?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index f4f79c6..628f040 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -158,7 +158,7 @@ display_top_tabs($tab_array); <th><?=gettext('Pool'); ?></th> <th><?=gettext('Fallback pool'); ?></th> <th><?=gettext('Description'); ?></th> - <th><!-- Action buttons --></th> + <th><?=gettext('Actions'); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index b603b06..05d96e0 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -127,8 +127,12 @@ if ($_REQUEST['ajax']) { // Log file is read a line at a time so that we can detect/modify certain entries while (($logline = fgets($logfile)) !== false) { // Check for return codes and replace with suitable strings - if (strpos($logline, "_RC=") != false) { - $code = str_replace("__RC=", "", $logline); + if (strpos($logline, "__RC=") == 0) { + list($code, $reboot_after) = explode(" ", $logline); + + $code = str_replace("__RC=", "", $code); + /* XXX: Implement a GUI timeout counter if (is_numericint($reboot_after)) */ + $reboot_after = str_replace("__REBOOT_AFTER=", "", $reboot_after); if ($code == 0) { $logline = gettext("Success") . "\n"; @@ -224,7 +228,7 @@ if ($_POST) { case 'reinstallall': $headline = gettext("Reinstall all packages"); case 'reinstallpkg': - if ($_GET['from'] && $_GET['from']) { + if ($_GET['from'] && $_GET['to']) { $headline = gettext("Upgrade package"); } else { $headline = gettext("Reinstall package"); @@ -243,7 +247,7 @@ if ($_POST) { if ($_GET && $_GET['id'] == "firmware") { $firmwareupdate = true; $firmwareversion = get_system_pkg_version(); - $headline = gettext("System update") ; + $headline = gettext("System Update") ; } $tab_array = array(); @@ -300,13 +304,13 @@ if ($input_errors) { ?> <?=gettext("All packages will be reinstalled.");?> <?php - } else if ($_GET['from'] && $_GET['from']) { + } else if ($_GET['from'] && $_GET['to']) { ?> Package: <b><?=$pkgname;?></b> will be upgraded from <b><?=$_GET['from']?></b> to <b><?=$_GET['to']?></b>. <?php } else if ($firmwareupdate) { ?> - <?=$g['product_name']?> <?=gettext(" system update")?> + <?=$g['product_name']?> <?=gettext(" System Update")?> <?php } else { ?> @@ -343,7 +347,7 @@ if ($input_errors) { ?> <div class="form-group"> <label class="col-sm-2 control-label"> - <?=gettext("Confirm Upgrade")?> + <?=gettext("Confirm Update")?> </label> <div class="col-sm-10"> <input type="hidden" name="id" value="firmware" /> diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index 3545558..c9f24ff 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -106,7 +106,7 @@ display_top_tabs($tab_array); ?> <form action="services_dyndns.php" method="post" name="iform" id="iform"> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Dynamic DNS clients')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Dynamic DNS Clients')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index 840db21..4c22271 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -122,7 +122,7 @@ if (is_subsystem_dirty('igmpproxy')) { <th><?=gettext("Type")?></th> <th><?=gettext("Values")?></th> <th><?=gettext("Description")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index adde884..ba54368 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -283,7 +283,7 @@ display_top_tabs($tab_array); $form = new Form; -$section = new Form_Section('NTP server configuration'); +$section = new Form_Section('NTP Server Configuration'); $iflist = build_interface_list(); diff --git a/src/usr/local/www/services_pppoe.php b/src/usr/local/www/services_pppoe.php index fc40515..a0cf2f4 100644 --- a/src/usr/local/www/services_pppoe.php +++ b/src/usr/local/www/services_pppoe.php @@ -138,7 +138,7 @@ if (is_subsystem_dirty('vpnpppoe')) { <th><?=gettext("Local IP")?></th> <th><?=gettext("Number of users")?></th> <th><?=gettext("Description")?></th> - <th><!-- Action buttons --></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index 31a9270..afb6e86 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -104,18 +104,18 @@ if ($input_errors) { <form action="services_rfc2136.php" method="post" name="iform" id="iform"> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('RFC2136 clients')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('RFC2136 Clients')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("IF")?></th> + <th><?=gettext("Interface")?></th> <th><?=gettext("Server")?></th> <th><?=gettext("Hostname")?></th> <th><?=gettext("Cached IP")?></th> <th><?=gettext("Description")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index a139000..f7a90e7 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -200,7 +200,7 @@ print $form; <th><?=gettext("Interface")?></th> <th><?=gettext("MAC address")?></th> <th><?=gettext("Description")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index b0c4b86..089c759 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -374,6 +374,7 @@ if (count($pools) > 0) { <th><?=gettext("End")?></th> <th><?=gettext("Online")?></th> <th><?=gettext("Lease Type")?></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index e665049..cd6dcb3 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -449,6 +449,7 @@ if (empty($leases)) { <th><?=gettext("End")?></th> <th><?=gettext("Online")?></th> <th><?=gettext("Lease Type")?></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php index 0ae10c0..2bea2c7 100644 --- a/src/usr/local/www/status_rrd_graph.php +++ b/src/usr/local/www/status_rrd_graph.php @@ -297,7 +297,16 @@ $graph_length = array( "year" => 31622400, "fouryear" => 126230400); -$pgtitle = array(gettext("Status"), gettext("RRD Graphs"), gettext(ucfirst($curcat)." Graphs")); +switch ($curcat) { + case "vpnusers": + $curcattext = "VPN Users"; + break; + default: + $curcattext = ucfirst($curcat); + break; +} + +$pgtitle = array(gettext("Status"), gettext("RRD Graphs"), gettext($curcattext . " Graphs")); /* Load all CP zones */ if ($captiveportal && is_array($config['captiveportal'])) { diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php index 070ecae..9c63c66 100644 --- a/src/usr/local/www/status_upnp.php +++ b/src/usr/local/www/status_upnp.php @@ -94,7 +94,7 @@ if (!$config['installedpackages'] || ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('UPnP rules')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext(gettext("UPnP & NAT-PMP Rules"))?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index cb84861..7c56b93 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -371,7 +371,7 @@ $section->addInput(new Form_Input( 'local hosts not running mDNS.'); $form->add($section); -$section = new Form_Section('DNS server settings'); +$section = new Form_Section('DNS Server Settings'); for ($i=1; $i<5; $i++) { // if (!isset($pconfig['dns'.$i])) @@ -424,7 +424,7 @@ for ($i=1; $i<5; $i++) { $section->addInput(new Form_Checkbox( 'dnsallowoverride', - 'DNS server override', + 'DNS Server Override', 'Allow DNS server list to be overridden by DHCP/PPP on WAN', $pconfig['dnsallowoverride'] ))->setHelp(sprintf(gettext('If this option is set, %s will use DNS servers '. @@ -434,7 +434,7 @@ $section->addInput(new Form_Checkbox( $section->addInput(new Form_Checkbox( 'dnslocalhost', - 'Disable DNS forwarder', + 'Disable DNS Forwarder', 'Do not use the DNS Forwarder as a DNS server for the firewall', $pconfig['dnslocalhost'] ))->setHelp('By default localhost (127.0.0.1) will be used as the first DNS '. diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index c1ee41e..75e71a6 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -396,7 +396,7 @@ if (!($act == "new" || $act == "edit" || $input_errors)) { ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Authentication servers')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Authentication Servers')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index f7f35f5..950020c 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -141,7 +141,7 @@ $tab_array[] = array(gettext("Gateway Groups"), true, "system_gateway_groups.php display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Gateway groups')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Gateway Groups')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index fc7667f..0babde8 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -265,7 +265,7 @@ display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('Static routes')?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('Static Routes')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed"> diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index f2f6860..07ca150 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -496,7 +496,7 @@ if (!($act == "new" || $act == "edit" || $input_errors)) { <th><?=gettext("Full name")?></th> <th><?=gettext("Disabled")?></th> <th><?=gettext("Groups")?></th> - <th> </th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 1aee3a6..053b408 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -138,7 +138,7 @@ if (is_subsystem_dirty('ipsec')) { <th><?=gettext("Identifier"); ?></th> <th><?=gettext("Type"); ?></th> <th><?=gettext("Pre-Shared Key"); ?></th> - <th></th> + <th><?=gettext("Actions"); ?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index dae7a72..cb9cc7d 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -120,7 +120,7 @@ $tab_array[] = array(gettext("Users"), true, "vpn_l2tp_users.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext('L2TP Users')?>></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext('L2TP Users')?></h2></div> <div class="panel-body"> <div class="table-responsive"> <table class="table table-striped table-hover"> diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 5698468..8d41ddb 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -799,7 +799,7 @@ else: <th><?=gettext("Protocol")?></th> <th><?=gettext("Server")?></th> <th><?=gettext("Description")?></th> - <th><!-- Buttons --></th> + <th><?=gettext("Actions")?></th> </tr> </thead> diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 0dddf20..870c5a5 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -665,7 +665,7 @@ else : // Not an 'add' or an 'edit'. Just the table of Override CSCs <th><?=gettext("Disabled")?></th> <th><?=gettext("Common Name")?></th> <th><?=gettext("Description")?></th> - <th> <!-- Buttons --></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 3278530..eaaa76e 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -1200,7 +1200,7 @@ else: <th><?=gettext("Protocol / Port")?></th> <th><?=gettext("Tunnel Network")?></th> <th><?=gettext("Description")?></th> - <th><!-- Buttons --></th> + <th><?=gettext("Actions")?></th> </tr> </thead> |
