diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 12 | ||||
| -rw-r--r-- | usr/local/share/locale/tr/LC_MESSAGES/pfSense.po | 12 | ||||
| -rw-r--r-- | usr/local/www/interfaces.php | 12 | ||||
| -rw-r--r-- | usr/local/www/services_captiveportal_mac.php | 2 | ||||
| -rw-r--r-- | usr/local/www/status_dhcp_leases.php | 24 |
5 files changed, 25 insertions, 37 deletions
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 7419f47..c9ba827 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -13978,7 +13978,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Interface_statement\">Interface Statement</a>" +"+10.1-RELEASE+and+Ports#Interface_statement\">Interface Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2265 @@ -14025,7 +14025,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Identity_association_statement\">Identity Association Statement</a>" +"+10.1-RELEASE+and+Ports#Identity_association_statement\">Identity Association Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2299 @@ -14080,7 +14080,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>" +"+10.1-RELEASE+and+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2338 @@ -14099,7 +14099,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Authentication_statement\">Authentication Statement</a>" +"+10.1-RELEASE+and+Ports#Authentication_statement\">Authentication Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2351 @@ -14122,7 +14122,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Keyinfo_statement\">Keyinfo Statement</a>" +"+10.1-RELEASE+and+Ports#Keyinfo_statement\">Keyinfo Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2367 @@ -14148,7 +14148,7 @@ msgstr "" #: usr/local/www/interfaces.php:2383 msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" -"query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports" +"query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports" "\">Configuration File</a> Override" msgstr "" diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po index c384e17..e3753eb 100644 --- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po @@ -14547,7 +14547,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Interface_statement\">Interface Statement</a>" +"+10.1-RELEASE+and+Ports#Interface_statement\">Interface Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2265 @@ -14594,7 +14594,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Identity_association_statement\">Identity Association Statement</a>" +"+10.1-RELEASE+and+Ports#Identity_association_statement\">Identity Association Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2299 @@ -14649,7 +14649,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>" +"+10.1-RELEASE+and+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2338 @@ -14668,7 +14668,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Authentication_statement\">Authentication Statement</a>" +"+10.1-RELEASE+and+Ports#Authentication_statement\">Authentication Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2351 @@ -14691,7 +14691,7 @@ msgstr "" msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" "query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD" -"+Ports#Keyinfo_statement\">Keyinfo Statement</a>" +"+10.1-RELEASE+and+Ports#Keyinfo_statement\">Keyinfo Statement</a>" msgstr "" #: usr/local/www/interfaces.php:2367 @@ -14717,7 +14717,7 @@ msgstr "" #: usr/local/www/interfaces.php:2383 msgid "" "<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?" -"query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports" +"query=dhcp6c.conf&sektion=5&apropos=0&manpath=+10.1-RELEASE+and+Ports" "\">Configuration File</a> Override" msgstr "" diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 78e6d37..69e19bf 100644 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -2257,7 +2257,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_interface_statement"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports#Interface_statement\">Interface Statement</a>"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports#Interface_statement\">Interface Statement</a>"); ?> <br /><br /> <input name="adv_dhcp6_interface_statement_information_only_enable" type="checkbox" id="adv_dhcp6_interface_statement_information_only_enable" value="" onclick="show_adv_dhcp6_config(this)" /> <?=gettext("Information Only"); ?> @@ -2289,7 +2289,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_id_assoc_statement"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports#Identity_association_statement\">Identity Association Statement</a>"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports#Identity_association_statement\">Identity Association Statement</a>"); ?> </td> <td width="78%" class="vtable"> @@ -2330,7 +2330,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_prefix_interface_statement"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports#Prefix_interface_statement\">Prefix Interface Statement</a>"); ?> </td> <td width="78%" class="vtable"> <?=gettext("Prefix Interface "); ?> @@ -2343,7 +2343,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_authentication_statement"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports#Authentication_statement\">Authentication Statement</a>"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports#Authentication_statement\">Authentication Statement</a>"); ?> </td> <td width="78%" class="vtable"> <?=gettext("<i>authname</i>"); ?> @@ -2359,7 +2359,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_key_info_statement"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports#Keyinfo_statement\">Keyinfo Statement</a>"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports#Keyinfo_statement\">Keyinfo Statement</a>"); ?> </td> <td width="78%" class="vtable"> <?=gettext("<i>keyname</i>"); ?> @@ -2378,7 +2378,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), <tr style='display:none' id="show_adv_dhcp6_config_file_override"> <td width="22%" valign="top" class="vncell"> - <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+Ports\">Configuration File</a> Override"); ?> + <?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and+Ports\">Configuration File</a> Override"); ?> </td> <td width="78%" class="vtable"> <input name="adv_dhcp6_config_file_override_path" type="text" class="formfld unknown" id="adv_dhcp6_config_file_override_path" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp6_config_file_override_path']);?>" /> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index b7358d2..b81a4c2 100644 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -122,7 +122,7 @@ if ($_POST) { @unlink("{$g['tmp_path']}/{$uniqid}_tmp"); unset($a_passthrumacs[$idx]); write_config(); - echo gettext("The entry was sucessfully deleted") . "\n"; + echo gettext("The entry was successfully deleted") . "\n"; } else echo gettext("No entry exists for this mac address:") . " " . $_POST['delmac'] . "\n"; } diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php index 88803c4..191d9f5 100644 --- a/usr/local/www/status_dhcp_leases.php +++ b/usr/local/www/status_dhcp_leases.php @@ -274,17 +274,21 @@ if(count($pools) > 0) { foreach($config['interfaces'] as $ifname => $ifarr) { if (is_array($config['dhcpd'][$ifname]) && is_array($config['dhcpd'][$ifname]['staticmap'])) { + $staticmap_array_index = 0; foreach($config['dhcpd'][$ifname]['staticmap'] as $static) { $slease = array(); $slease['ip'] = $static['ipaddr']; $slease['type'] = "static"; $slease['mac'] = $static['mac']; + $slease['if'] = $ifname; $slease['start'] = ""; $slease['end'] = ""; $slease['hostname'] = htmlentities($static['hostname']); $slease['act'] = "static"; $slease['online'] = in_array(strtolower($slease['mac']), $arpdata_mac) ? 'online' : 'offline'; + $slease['staticmap_array_index'] = $staticmap_array_index; $leases[] = $slease; + $staticmap_array_index++; } } } @@ -349,23 +353,7 @@ foreach ($leases as $data) { $fspane = " "; } $lip = ip2ulong($data['ip']); - if ($data['act'] == "static") { - foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if(is_array($dhcpifconf['staticmap'])) { - $staticmap_array_index = 0; - foreach ($dhcpifconf['staticmap'] as $staticent) { - if ($data['ip'] == $staticent['ipaddr']) { - $data['if'] = $dhcpif; - break; - } - $staticmap_array_index++; - } - } - /* exit as soon as we have an interface */ - if ($data['if'] != "") - break; - } - } else { + if ($data['act'] != "static") { foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { if (!is_array($dhcpifconf['range'])) continue; @@ -407,7 +395,7 @@ foreach ($leases as $data) { echo "<a href=\"services_dhcp_edit.php?if={$data['if']}&mac={$data['mac']}&hostname={$data['hostname']}\">"; echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"" . gettext("add a static mapping for this MAC address") ."\" alt=\"add\" /></a> \n"; } else { - echo "<a href=\"services_dhcp_edit.php?if={$data['if']}&id={$staticmap_array_index}\">"; + echo "<a href=\"services_dhcp_edit.php?if={$data['if']}&id={$data['staticmap_array_index']}\">"; echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_e.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"" . gettext("edit the static mapping for this entry") ."\" alt=\"add\" /> \n"; } |
