diff --git a/src/www/bandwidth_by_ip.php b/src/www/bandwidth_by_ip.php index 50cda607b..056b0abac 100755 --- a/src/www/bandwidth_by_ip.php +++ b/src/www/bandwidth_by_ip.php @@ -32,11 +32,6 @@ * */ -/* - pfSense_BUILDER_BINARIES: /usr/local/bin/rate - pfSense_MODULE: trafficgraph -*/ - require_once('guiconfig.inc'); require_once('interfaces.inc'); require_once('pfsense-utils.inc'); diff --git a/src/www/carp_status.php b/src/www/carp_status.php index 9418589eb..c2bde1e99 100644 --- a/src/www/carp_status.php +++ b/src/www/carp_status.php @@ -26,17 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -##|+PRIV -##|*IDENT=page-status-carp -##|*NAME=Status: CARP page -##|*DESCR=Allow access to the 'Status: CARP' page. -##|*MATCH=carp_status.php* -##|-PRIV - -/* - pfSense_MODULE: carp -*/ - require_once("guiconfig.inc"); require_once("globals.inc"); @@ -167,15 +156,15 @@ include("head.inc"); echo ""; $align = "style=\"vertical-align:middle\""; if($carp_enabled == false) { - $icon = "\"disabled\""; + $icon = ""; $status = "DISABLED"; } else { if($status == "MASTER") { - $icon = "\"master\""; + $icon = ""; } else if($status == "BACKUP") { - $icon = "\"backup\""; + $icon = ""; } else if($status == "INIT") { - $icon = "\"init\""; + $icon = ""; } } echo "" . convert_friendly_interface_to_friendly_descr($carp['interface']) . "@{$vhid}  "; diff --git a/src/www/crash_reporter.php b/src/www/crash_reporter.php index de2e1ce46..403a66570 100644 --- a/src/www/crash_reporter.php +++ b/src/www/crash_reporter.php @@ -1,5 +1,4 @@ " . gettext("Unfortunately we have detected a programming bug.") . "

"; - echo "

" . gettext("Would you like to submit the programming debug logs to the pfSense developers for inspection?") . "

"; + echo "

" . gettext("Would you like to submit the programming debug logs to the OPNsense developers for inspection?") . "

"; echo "

" . gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.") . "

"; echo "

" . gettext("Contents of crash reports") . ":
"; echo "

"; diff --git a/src/www/diag_arp.php b/src/www/diag_arp.php index 0a323481f..d08fc13ea 100644 --- a/src/www/diag_arp.php +++ b/src/www/diag_arp.php @@ -1,11 +1,7 @@ - - originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper . All rights reserved. @@ -31,18 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp - pfSense_MODULE: arp -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-arptable -##|*NAME=Diagnostics: ARP Table page -##|*DESCR=Allow access to the 'Diagnostics: ARP Table' page. -##|*MATCH=diag_arp.php* -##|-PRIV - @ini_set('zlib.output_compression', 0); @ini_set('implicit_flush', 1); diff --git a/src/www/diag_authentication.php b/src/www/diag_authentication.php index 9b796fdb2..54b64ff03 100644 --- a/src/www/diag_authentication.php +++ b/src/www/diag_authentication.php @@ -1,8 +1,6 @@ ")) { - log_error(gettext("Upgrading m0n0wall configuration to pfsense.")); + log_error(gettext("Upgrading m0n0wall configuration to OPNsense.")); /* m0n0wall was found in config. convert it. */ $data = str_replace("m0n0wall", "pfsense", $data); $m0n0wall_upgrade = true; @@ -512,7 +500,7 @@ if ($_POST) { add_base_packages_menu_items(); convert_config(); conf_mount_ro(); - $savemsg = gettext("The m0n0wall configuration has been restored and upgraded to pfSense."); + $savemsg = gettext("The m0n0wall configuration has been restored and upgraded to OPNsense."); mark_subsystem_dirty("restore"); } if(is_array($config['captiveportal'])) { diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php index 750b370e5..ff1af880b 100644 --- a/src/www/diag_confbak.php +++ b/src/www/diag_confbak.php @@ -28,17 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: config -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-configurationhistory -##|*NAME=Diagnostics: Configuration History page -##|*DESCR=Allow access to the 'Diagnostics: Configuration History' page. -##|*MATCH=diag_confbak.php* -##|-PRIV - require("guiconfig.inc"); if (isset($_POST['backupcount'])) { diff --git a/src/www/diag_defaults.php b/src/www/diag_defaults.php index 3c8f8d8c9..5382ad491 100755 --- a/src/www/diag_defaults.php +++ b/src/www/diag_defaults.php @@ -1,5 +1,4 @@
    • -
    • +
  • ''

    • diff --git a/src/www/diag_dns.php b/src/www/diag_dns.php index 64370361e..9bcd2d939 100644 --- a/src/www/diag_dns.php +++ b/src/www/diag_dns.php @@ -26,10 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: dns -*/ - $pgtitle = array(gettext("Diagnostics"),gettext("DNS Lookup")); require("guiconfig.inc"); diff --git a/src/www/diag_dump_states.php b/src/www/diag_dump_states.php index b25d9cc8c..bf93a4fb9 100755 --- a/src/www/diag_dump_states.php +++ b/src/www/diag_dump_states.php @@ -27,18 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-showstates -##|*NAME=Diagnostics: Show States page -##|*DESCR=Allow access to the 'Diagnostics: Show States' page. -##|*MATCH=diag_dump_states.php* -##|-PRIV - require_once("guiconfig.inc"); require_once("interfaces.inc"); @@ -85,7 +73,7 @@ include("head.inc"); jQuery(icon).css("cursor","wait"); } - jQuery('img[name="i:' + srcip + ":" + dstip + '"]').each(busy); + jQuery('span[name="i:' + srcip + ":" + dstip + '"]').each(busy); jQuery.ajax( "", diff --git a/src/www/diag_dump_states_sources.php b/src/www/diag_dump_states_sources.php index 1029e7d9a..11123ce12 100644 --- a/src/www/diag_dump_states_sources.php +++ b/src/www/diag_dump_states_sources.php @@ -27,18 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/pfctl - pfSense_MODULE: filter -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-showstates -##|*NAME=Diagnostics: Show States page -##|*DESCR=Allow access to the 'Diagnostics: Show States' page. -##|*MATCH=diag_dump_states.php* -##|-PRIV - require_once("guiconfig.inc"); /* handle AJAX operations */ @@ -80,7 +68,7 @@ include("head.inc"); jQuery(icon).css("cursor","wait"); } - jQuery('img[name="i:' + srcip + ":" + dstip + '"]').each(busy); + jQuery('span[name="i:' + srcip + ":" + dstip + '"]').each(busy); jQuery.ajax( "" + @@ -103,7 +91,7 @@ include("head.inc"); //]]> - +
    - +
    \n"; + echo " " . gettext("Online") . "\n"; } else { echo '\n"; + echo " " . gettext("Offline") . "\n"; } echo '\n"; } diff --git a/src/www/wizards/openvpn_wizard.inc b/src/www/wizards/openvpn_wizard.inc index 2308bcf8a..9524beb92 100644 --- a/src/www/wizards/openvpn_wizard.inc +++ b/src/www/wizards/openvpn_wizard.inc @@ -24,7 +24,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - pfSense_MODULE: openvpn */ require_once("openvpn.inc"); diff --git a/src/www/wizards/openvpn_wizard.xml b/src/www/wizards/openvpn_wizard.xml index c7293aead..28591e898 100644 --- a/src/www/wizards/openvpn_wizard.xml +++ b/src/www/wizards/openvpn_wizard.xml @@ -2,8 +2,7 @@ /* - part of pfSense (https://www.pfsense.org/) - + Copyright (C) 2014 Deciso B.V. Copyright (C) 2010 Ermal Luci All rights reserved. @@ -402,7 +401,7 @@ country Country Code - Two-letter ISO country code (e.g. US, AU, CA) + Two-letter ISO country code (e.g. NL, DE, FR, US) input 5 ovpnserver->step6->country @@ -410,7 +409,7 @@ state State or Province - Full State of Province name, not abbreviated (e.g. Kentucky, Indiana, Ontario). + Full State of Province name, not abbreviated (e.g. Zuid Holland, Saksen, Paris, Kentucky). input 30 ovpnserver->step6->state @@ -418,7 +417,7 @@ city City - City or other Locality name (e.g. Louisville, Indianapolis, Toronto). + City or other Locality name (e.g. Middelharnis, Leipzig, Île-de-France, Louisville). input 30 ovpnserver->step6->city @@ -533,7 +532,7 @@ country Country Code - Two-letter ISO country code (e.g. US, AU, CA) + Two-letter ISO country code (e.g. NL, DE, FR, US) input 5 ovpnserver->step9->country @@ -541,7 +540,7 @@ state State or Province - Full State of Province name, not abbreviated (e.g. Kentucky, Indiana, Ontario). + Full State of Province name, not abbreviated (e.g. Zuid Holland, Saksen, Paris, Kentucky). input 30 ovpnserver->step9->state @@ -549,7 +548,7 @@ city City - City or other Locality name (e.g. Louisville, Indianapolis, Toronto). + City or other Locality name (e.g. Middelharnis, Leipzig, Île-de-France, Louisville). input 30 ovpnserver->step9->city diff --git a/src/www/wizards/setup_wizard.xml b/src/www/wizards/setup_wizard.xml index 25e162026..c0a881d28 100644 --- a/src/www/wizards/setup_wizard.xml +++ b/src/www/wizards/setup_wizard.xml @@ -1,12 +1,9 @@ -/* $Id$ */ /* - setup.xml - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2004, 2005 Scott Ullrich + Copyright (C) 2014 Deciso B.V. + Copyright (C) 2004, 2005 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,12 +28,12 @@ POSSIBILITY OF SUCH DAMAGE. */ -10 +9 1 - pfSense Setup Wizard + OPNsense Setup Wizard true - This wizard will guide you through the initial configuration of pfSense.<br/><br/> The wizard may be stopped at any time by clicking the logo image at the top of the screen. + This wizard will guide you through the initial configuration of OPNsense.<br/><br/> The wizard may be stopped at any time by clicking the logo image at the top of the screen. Next @@ -51,20 +48,8 @@ 2 - Bling your pfSense with pfSense Gold - true - Feel the power of a pfSense Gold subscription. Receive special benefits while supporting ongoing development of the Open Source pfSense project.<br/> <br/> Benefits include access to our AutoConfigBackup secure cloud based backup service for up to 10 hosts, pre-publication access to the updated pfSense: The Definitive Guide book in PDF, fully updated for the pfSense 2.1 release, and a monthly online MeetUp! Video conference to discuss and demonstrate advanced features and architectures using pfSense. <br/> <br/> Go to <a href="https://www.pfsense.org/gold" target="_blank"> pfSense Gold Subscriptions</a> to sign up now <br/> <br/> - - - Next - submit - - - - - 3 General Information - On this screen you will set the general pfSense parameters. + On this screen you will set the general OPNsense parameters. Hostname @@ -141,7 +126,7 @@ - 4 + 3 Time Server Information Please enter the time, date and time zone. @@ -173,7 +158,7 @@ - 5 + 4 true Configure WAN Interface On this screen we will configure the Wide Area Network information. @@ -501,7 +486,7 @@ - 6 + 5 Configure LAN Interface On this screen we will configure the Local Area Network information. @@ -546,7 +531,7 @@ - 7 + 6 Set Admin WebGUI Password On this screen we will set the admin password, which is used to access the WebGUI and also SSH services if you wish to enable them. @@ -578,10 +563,10 @@ - 8 + 7 Reload configuration true - Click 'Reload' to reload pfSense with new changes. + Click 'Reload' to reload OPNsense with new changes. Reload @@ -590,7 +575,7 @@ - 9 + 8 Reload in progress A reload is now in progress. Please wait. <p> @@ -638,7 +623,7 @@ - 10 + 9 Wizard completed. + Congratulations! OPNsense is now configured.

    Please consider donating to the project to help us with our overhead costs.

    - Click here to donate or purchase services offered by the pfSense team.

    - Click here to continue on to pfSense webConfigurator. + See OPNsense.org to donate or purchase services offered by the OPNsense team.

    + Click here to continue on to OPNsense webConfigurator. ]]> diff --git a/src/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/www/wizards/traffic_shaper_wizard_dedicated.inc index 82a2b82a8..0124b7875 100644 --- a/src/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/src/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1,8 +1,6 @@ - 9 + 8 1 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true - This wizard will guide you through setting up the pfSense traffic shaper. + This wizard will guide you through setting up the OPNsense traffic shaper. Please be aware that Custom Bandwidths should not exceed 30% of the interface/link bandwidth. Keep this in mind during the wizard. @@ -63,7 +61,7 @@ 2 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Shaper configuration step2_stepbeforeformdisplay(); @@ -78,7 +76,7 @@ 3 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Voice over IP @@ -145,7 +143,7 @@ 4 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Penalty Box true @@ -223,7 +221,7 @@ 5 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Peer to Peer networking true @@ -430,7 +428,7 @@ 6 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true Network Games @@ -752,7 +750,7 @@ 7 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true Raise or lower other Applications @@ -1610,7 +1608,7 @@ 8 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Reload profile notice listtopic diff --git a/src/www/wizards/traffic_shaper_wizard_multi_all.inc b/src/www/wizards/traffic_shaper_wizard_multi_all.inc index c3e0e280b..e623a1d30 100644 --- a/src/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/src/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1,8 +1,6 @@ - 9 + 8 1 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true - This wizard will guide you through setting up the pfSense traffic shaper. + This wizard will guide you through setting up the OPNsense traffic shaper. Please be aware that Custom Bandwidths should not exceed 30% of the interface/link bandwidth. Keep this in mind during the wizard. @@ -71,7 +69,7 @@ 2 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Shaper configuration step2_stepbeforeformdisplay(); @@ -86,7 +84,7 @@ 3 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Voice over IP @@ -153,7 +151,7 @@ 4 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Penalty Box true @@ -231,7 +229,7 @@ 5 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Peer to Peer networking true @@ -438,7 +436,7 @@ 6 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true Network Games @@ -760,7 +758,7 @@ 7 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard true Raise or lower other Applications @@ -1618,7 +1616,7 @@ 8 - pfSense Traffic Shaper Wizard + OPNsense Traffic Shaper Wizard Reload profile notice listtopic

    - + + + + + +
      + +
    - " /> + + " />
    @@ -140,7 +136,7 @@ include("head.inc");
    - +
    @@ -175,10 +171,11 @@ if(count($sources) > 0) { @@ -218,25 +206,25 @@ $status = ipsec_smp_dump_status(); @@ -408,14 +396,14 @@ $status = ipsec_smp_dump_status(); diff --git a/src/www/diag_ipsec_leases.php b/src/www/diag_ipsec_leases.php index 9be63855c..a1ccb17fd 100644 --- a/src/www/diag_ipsec_leases.php +++ b/src/www/diag_ipsec_leases.php @@ -1,5 +1,4 @@ . @@ -27,17 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: captiveportal -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-portalauth -##|*NAME=Status: System logs: Portal Auth page -##|*DESCR=Allow access to the 'Status: System logs: Portal Auth' page. -##|*MATCH=diag_logs_auth.php* -##|-PRIV - require("guiconfig.inc"); $portal_logfile = "{$g['varlog_path']}/portalauth.log"; diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php index b356b88bc..5348a73fd 100644 --- a/src/www/diag_logs_dhcp.php +++ b/src/www/diag_logs_dhcp.php @@ -1,5 +1,4 @@ . @@ -28,17 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: ntpd -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-ntpd -##|*NAME=Status: System logs: NTP page -##|*DESCR=Allow access to the 'Status: System logs: NTP' page. -##|*MATCH=diag_logs_ntpd.php* -##|-PRIV - require("guiconfig.inc"); $ntpd_logfile = "{$g['varlog_path']}/ntpd.log"; diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php index bf41e6109..1e97d500b 100644 --- a/src/www/diag_logs_openvpn.php +++ b/src/www/diag_logs_openvpn.php @@ -1,7 +1,6 @@ . All rights reserved. @@ -28,17 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: openvpn -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-openvpn -##|*NAME=Status: System logs: OpenVPN page -##|*DESCR=Allow access to the 'Status: System logs: OpenVPN' page. -##|*MATCH=diag_logs_openvpn.php* -##|-PRIV - $pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN")); $shortcut_section = "openvpn"; diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php index 232b3c3d3..25c7f88c7 100644 --- a/src/www/diag_logs_ppp.php +++ b/src/www/diag_logs_ppp.php @@ -1,5 +1,4 @@ . @@ -28,17 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-loadbalancer -##|*NAME=Status: System logs: Load Balancer page -##|*DESCR=Allow access to the 'Status: System logs: Load Balancer' page. -##|*MATCH=diag_logs_relayd.php* -##|-PRIV - require("guiconfig.inc"); $relayd_logfile = "{$g['varlog_path']}/relayd.log"; diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php index af925feac..07b6c9435 100755 --- a/src/www/diag_logs_resolver.php +++ b/src/www/diag_logs_resolver.php @@ -1,5 +1,4 @@ . @@ -27,17 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-routing -##|*NAME=Status: System logs: Routing page -##|*DESCR=Allow access to the 'Status: System logs: System: Routing' page. -##|*MATCH=diag_logs_routing.php* -##|-PRIV - require("guiconfig.inc"); $routing_logfile = "{$g['varlog_path']}/routing.log"; diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index 90f26cc14..44f4aad4f 100644 --- a/src/www/diag_logs_settings.php +++ b/src/www/diag_logs_settings.php @@ -1,5 +1,4 @@ . @@ -29,17 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-wireless -##|*NAME=Status: System logs: Wireless page -##|*DESCR=Allow access to the 'Status: System logs: System: Wireless' page. -##|*MATCH=diag_logs_wireless.php* -##|-PRIV - require("guiconfig.inc"); $wireless_logfile = "{$g['varlog_path']}/wireless.log"; diff --git a/src/www/diag_nanobsd.php b/src/www/diag_nanobsd.php index 2085855c3..cdcab5683 100644 --- a/src/www/diag_nanobsd.php +++ b/src/www/diag_nanobsd.php @@ -26,19 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/glabel /usr/bin/grep /usr/bin/cut /usr/bin/head /bin/cp - pfSense_BUILDER_BINARIES: /usr/sbin/boot0cfg /bin/mkdir /sbin/fsck_ufs /sbin/mount /bin/dd /sbin/tunefs - pfSense_MODULE: nanobsd -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-nanobsd -##|*NAME=Diagnostics: NanoBSD -##|*DESCR=Allow access to the 'Diagnostics: NanoBSD' page. -##|*MATCH=diag_nanobsd.php* -##|-PRIV - ini_set('zlib.output_compression', 0); ini_set('implicit_flush', 1); ini_set('max_input_time', '9999'); diff --git a/src/www/diag_ndp.php b/src/www/diag_ndp.php index cea6eabf5..1d771c0a8 100644 --- a/src/www/diag_ndp.php +++ b/src/www/diag_ndp.php @@ -28,18 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp - pfSense_MODULE: arp -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-ndptable -##|*NAME=Diagnostics: NDP Table page -##|*DESCR=Allow access to the 'Diagnostics: NDP Table' page. -##|*MATCH=diag_ndp.php* -##|-PRIV - @ini_set('zlib.output_compression', 0); @ini_set('implicit_flush', 1); diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php index 80b8e1b43..e9dcacd96 100644 --- a/src/www/diag_packet_capture.php +++ b/src/www/diag_packet_capture.php @@ -24,18 +24,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /bin/ps /usr/bin/grep /usr/sbin/tcpdump - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-packetcapture -##|*NAME=Diagnostics: Packet Capture page -##|*DESCR=Allow access to the 'Diagnostics: Packet Capture' page. -##|*MATCH=diag_packet_capture.php* -##|-PRIV - $allowautocomplete = true; function fixup_host_logic($value) { diff --git a/src/www/diag_patterns.php b/src/www/diag_patterns.php index 19705d21f..75c679b98 100644 --- a/src/www/diag_patterns.php +++ b/src/www/diag_patterns.php @@ -1,5 +1,4 @@ - arpwatch - arpwatch - - - - /var/log/arpwatch.log - -*/ - -/* - pfSense_BUILDER_BINARIES: /usr/bin/netstat - pfSense_MODULE: pkgs -*/ - -##|+PRIV -##|*IDENT=page-status-packagelogs -##|*NAME=Status: Package logs page -##|*DESCR=Allow access to the 'Status: Package logs' page. -##|*MATCH=diag_pkglogs.php* -##|-PRIV - -require("guiconfig.inc"); -require("pkg-utils.inc"); - -if(!($nentries = $config['syslog']['nentries'])) $nentries = 50; - -//if ($_POST['clear']) -// clear_log_file($logfile); - -$i = 0; -$pkgwithlogging = false; -$apkg = $_GET['pkg']; -if(!$apkg) { // If we aren't looking for a specific package, locate the first package that handles logging. - if($config['installedpackages']['package'] <> "") { - foreach($config['installedpackages']['package'] as $package) { - if(is_array($package['logging'])) { - $pkgwithlogging = true; - $apkg = $package['name']; - $apkgid = $i; - break; - } - $i++; - } - } -} elseif($apkg) { - $apkgid = get_pkg_id($apkg); - if ($apkgid != -1) { - $pkgwithlogging = true; - $i = $apkgid; - } -} - -$pgtitle = array(gettext("Status"),gettext("Package logs")); -include("head.inc"); - -?> - - - - -
    -
    -
    - - - -
    - - - -
    - - -
    - -
    Destination");?> - /images/icons/icon_x.gif' height='17' width='17' border='0' + );" style='cursor:pointer;' name='i:' - title='' alt='' /> + title='' alt='' > +
    - +

    		- +
    - Connect VPN +
    - Disconnect VPN + - Disconnect VPN Connection +
    @@ -334,7 +322,7 @@ $status = ipsec_smp_dump_status();
    - Disconnect Child SA +
    - -
    Disconnected + + Disconnected
    - Connect VPN +
    - -
    - - - - - - - - - - - diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php index 15b2494ba..5856f6847 100644 --- a/src/www/diag_resetstate.php +++ b/src/www/diag_resetstate.php @@ -1,11 +1,7 @@ . All rights reserved. @@ -31,16 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: filter -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-resetstate -##|*NAME=Diagnostics: Reset state page -##|*DESCR=Allow access to the 'Diagnostics: Reset state' page. -##|*MATCH=diag_resetstate.php* -##|-PRIV require("guiconfig.inc"); require_once("filter.inc"); diff --git a/src/www/diag_routes.php b/src/www/diag_routes.php index 29b104374..9d1f2d003 100644 --- a/src/www/diag_routes.php +++ b/src/www/diag_routes.php @@ -1,8 +1,6 @@ . All rights reserved. @@ -32,18 +27,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/nc - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-testport -##|*NAME=Diagnostics: Test Port -##|*DESCR=Allow access to the 'Diagnostics: Test Port' page. -##|*MATCH=diag_testport.php* -##|-PRIV - $allowautocomplete = true; $pgtitle = array(gettext("Diagnostics"), gettext("Test Port")); diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php index 5ac600c93..25b77de89 100644 --- a/src/www/diag_traceroute.php +++ b/src/www/diag_traceroute.php @@ -1,8 +1,6 @@ . All rights reserved. @@ -28,18 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/traceroute - pfSense_MODULE: routing -*/ - -##|+PRIV -##|*IDENT=page-diagnostics-traceroute -##|*NAME=Diagnostics: Traceroute page -##|*DESCR=Allow access to the 'Diagnostics: Traceroute' page. -##|*MATCH=diag_traceroute.php* -##|-PRIV - require("guiconfig.inc"); $allowautocomplete = true; diff --git a/src/www/easyrule.php b/src/www/easyrule.php index a12b4ca5b..24f8dd533 100644 --- a/src/www/easyrule.php +++ b/src/www/easyrule.php @@ -1,7 +1,6 @@ . All rights reserved. @@ -30,16 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: aliases -*/ - -##|+PRIV -##|*IDENT=page-firewall-aliases -##|*NAME=Firewall: Aliases page -##|*DESCR=Allow access to the 'Firewall: Aliases' page. -##|*MATCH=firewall_aliases.php* -##|-PRIV require("guiconfig.inc"); require_once("functions.inc"); diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php index 7ae068843..07566f312 100755 --- a/src/www/firewall_aliases_edit.php +++ b/src/www/firewall_aliases_edit.php @@ -1,13 +1,9 @@ . All rights reserved. diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php index 5909caa98..ea838e84f 100755 --- a/src/www/firewall_aliases_import.php +++ b/src/www/firewall_aliases_import.php @@ -1,7 +1,6 @@ . All rights reserved. @@ -28,16 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-1-1 -##|*NAME=Firewall: NAT: 1:1 page -##|*DESCR=Allow access to the 'Firewall: NAT: 1:1' page. -##|*MATCH=firewall_nat_1to1.php* -##|-PRIV require("guiconfig.inc"); require_once("functions.inc"); diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php index f9d5621cd..979dfe6ac 100644 --- a/src/www/firewall_nat_1to1_edit.php +++ b/src/www/firewall_nat_1to1_edit.php @@ -1,9 +1,6 @@ . All rights reserved. @@ -28,16 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-1-1-edit -##|*NAME=Firewall: NAT: 1:1: Edit page -##|*DESCR=Allow access to the 'Firewall: NAT: 1:1: Edit' page. -##|*MATCH=firewall_nat_1to1_edit.php* -##|-PRIV require("guiconfig.inc"); require_once("interfaces.inc"); diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php index 8865cdcda..322c62f9d 100644 --- a/src/www/firewall_nat_edit.php +++ b/src/www/firewall_nat_edit.php @@ -1,9 +1,6 @@ . All rights reserved. @@ -28,16 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-portforward-edit -##|*NAME=Firewall: NAT: Port Forward: Edit page -##|*DESCR=Allow access to the 'Firewall: NAT: Port Forward: Edit' page. -##|*MATCH=firewall_nat_edit.php* -##|-PRIV require("guiconfig.inc"); require_once("itemid.inc"); diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php index f62777612..3c2356ab5 100644 --- a/src/www/firewall_nat_npt.php +++ b/src/www/firewall_nat_npt.php @@ -1,9 +1,6 @@ . All rights reserved. @@ -28,16 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-npt -##|*NAME=Firewall: NAT: NPT page -##|*DESCR=Allow access to the 'Firewall: NAT: NPT' page. -##|*MATCH=firewall_nat_npt.php* -##|-PRIV require("guiconfig.inc"); require_once("functions.inc"); diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php index a0fbe10e9..96326ebe1 100644 --- a/src/www/firewall_nat_npt_edit.php +++ b/src/www/firewall_nat_npt_edit.php @@ -1,9 +1,6 @@ . All rights reserved. @@ -28,16 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-npt-edit -##|*NAME=Firewall: NAT: NPt: Edit page -##|*DESCR=Allow access to the 'Firewall: NAT: NPt: Edit' page. -##|*MATCH=firewall_nat_npt_edit.php* -##|-PRIV function natnptcmp($a, $b) { return ipcmp($a['external'], $b['external']); diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php index 6c7bb840b..d0ec7ac54 100644 --- a/src/www/firewall_nat_out.php +++ b/src/www/firewall_nat_out.php @@ -1,11 +1,7 @@ . All rights reserved. @@ -30,16 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: nat -*/ - -##|+PRIV -##|*IDENT=page-firewall-nat-outbound -##|*NAME=Firewall: NAT: Outbound page -##|*DESCR=Allow access to the 'Firewall: NAT: Outbound' page. -##|*MATCH=firewall_nat_out.php* -##|-PRIV require("guiconfig.inc"); require_once("functions.inc"); diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php index cbc72ed67..465e80f73 100644 --- a/src/www/firewall_nat_out_edit.php +++ b/src/www/firewall_nat_out_edit.php @@ -1,7 +1,6 @@ 0) { $is_active = exec("/usr/sbin/arp -an |/usr/bin/grep {$wolent['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'"); if($is_active == 1) { echo '    		' . "\n"; - echo "\"pass\" " . gettext("Online") . "' . "\n"; - echo "\"block\" " . gettext("Offline") . "'; /*if($is_active) { */ /* Will always show wake-up button even if pfsense thinks it is awake */ /* } else { */ echo " "; - echo "wol\n"; + echo "\n"; /* } */ echo "