Use the new daemon for status->queues until a proper chart javascript library is availble
Merge remote-tracking branch 'upstream/master'
Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
Fix merge blip.
Merge remote branch 'upstream/master'
Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php
Include .inc files for plugin system
Add function header
Adding a new hook system for firewall nat edit and firewall rules edit page.Basically if the directory exists it will suck in the files to extend these pags.
/usr/local/pkg/firewall_nat/input_validation/usr/local/pkg/firewall_nat/pre_write_config/usr/local/pkg/firewall_nat/htmlphpearly...
Apply fix from wallabybob on the forum http://forum.pfsense.org/index.php/topic,37079.0.html
Conflicts: etc/inc/interfaces.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
Correct code to use correct refernces for proxy settings set in Advanced->misc. Reported-by: http://forum.pfsense.org/index.php/topic,36939.0.html
Correct curl setting for setting a proxy username and password. Reported-by: http://forum.pfsense.org/index.php/topic,36939.0.html
Resolves #1529. Check if the file exists before opening it.
Merge branch 'master' into smos-ipv6
Conflicts: etc/inc/pfsense-utils.inc
Fix small typo
MAC prefix to vendor resolution at Status->Interfaces, Status->DHCP leases, Diagnostics->ARP table
Add an option under advanced->misc to specify a proxy for retreiving pfsense package info or downloading packages.
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc...
Fix parse error
Restore the IPv6 counters I accidentally overwrote
Add a function that will calculate the ipv6 address for a given hardware address
Merge commit from Bill M for ipv6 counters and interface stats
Suppress curl errors (if we get a 404 it tosses its own error if there is no response body, just a 404 code.)
Make update check a little more robust. Timeout after a few seconds, and if we get a non-200 http code, ignore the response.
In update_alias_names_upon_change function add capability to access more deeply nested sections and fields.
Generalize pppoe server enabled check and use it elsewhere in the GUI that needed fixed. Still needs changes in filter.inc - Ticket #1243
Fix a date compare bug, resolves #1273
Merge branch 'master' into inc
Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc...
Conflicts: etc/inc/interfaces.inc etc/inc/system.inc
Scroll the textarea to bottom on each update
Take into account< 10 too
When installing packages on console (downloading) only show every 10% meaning 10% 20% 30% instead of 1% 2% 3% 4% 5%, etc
nuke trailing carriage returns
Conflicts: etc/inc/interfaces.inc etc/inc/vslb.inc usr/local/www/interfaces.php
Prevent division by zero if the file size is zero.
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc...
Actually we expect an array to be returned.
Hello xmlrpc to another function!
Tighten checks a bit also when check_firmware_version is called return the config version too.
Use send_event since touch()'ing files does not work.
Do not call filter_configure here the caller does. Also remove old code of the times when check_reload_status used files as trigers.
Use pfSense_sync()
Remove extraneous ')'. So much for php -l
Rework this loader.conf changing code a bit. Might help with ticket #560
Use php_uname where possible.
Nuke trailing c/r
Ticket #1023. Correct carp status even on the status page.
Ticket #1023. Correct the widget code bringing it full speed with latest carp code.
Upon restoring a config, replacing whole sections, or editing config.xml in edit.php, prevent possible accidental lockout from DNS rebind and HTTP referrer checks by disabling them until reboot or the next time they pass, whichever comes sooner. Ticket #1027
Fix problem with syslog adding/removing for pacakges. Fix sync pacakges to call the right functions. Optimizations and code cleanup along the way.
Clear up some code.
Boost timeout for file downloads to 60 seconds
Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
Conflicts: etc/inc/filter.inc etc/inc/system.inc usr/local/www/interfaces.php usr/local/www/interfaces_gif_edit.php
Separate this into the original case with the floating rule cases above it to fix some scenarios where the order was still wrong.
Move this function to allow removing it from easyrule.
Use php calls rather than forking to shell.
Remove trailing carriage return
Do not throw warnings on empty dhcpd arrays
Make sure that if either v4 or v6 dhcp servers are enabled that is_dhcp_enabled() will trigger
tack on the ipv6 information via the old fashioned way until the pfsense module is up to speed
Conflicts: etc/inc/authgui.inc
Add function to convert pfsense slice name to product name.
Fix quotes to use %N$X on gettext calls
Add additional acceptable version strings.
Conflicts: etc/inc/filter.inc etc/inc/gwlb.inc
Use foreach and check for type to avoid errors.
Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc
Use the new events mechanisms to dispatch events.
Fix gettext calls with printf to permit change strings order
Remove not existing function reference. Pointy-hat: myself
Setup polling per interface rather only at bootup. This is a proper fix and a optimization on large interface cases. Also setup_microcode and polling defaults before configuring interfaces.
Conflicts: etc/inc/interfaces.inc
Fixes #88. Actually fix all the mess that was caused by setup_microcode() which overwrote the whole decisions being made on boot from other code. Solve this by moving the setting of all interface capabilities to interface_configure() and just leaving microcode setup to setup_microcode. Also optimize and make more readble the polling setup if activated/deactivated. This also fixes the ticket issue because the settings are now kept after booting up and not overwritten by other code.
Implement gettext() calls on pfsense-utils.inc
Add l2tp where missing. Also add l2tp and igb to altq capable interfaces.
Refine the setting/checking of these variables a little.
Disable SSL peer verification in cURL. Also, explicitly set FOLLOWLOCATION to make sure that we can redirect properly. Both of these are needed to fix snort rule downloads.
Use the real interface list in setup_microcode() Fixes #705
Add checkboxes to disable TSO and LRO since some drivers will misbehave with them set. Resolves #703
Add build-time comparison also.
Modify pfsense-utils and status_interfaces.php so Uptime is shown for all PPPx type links.
Fix up for new ptpid scheme and iface name scheme.
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Trim the output. This only nails you if your interface is last in the list.
Conflicts: etc/inc/interfaces.inc etc/inc/pfsense-utils.inc
Make display of interface name and uptime work again on status_interfaces.php
One more $if changed to $ifdescr and remove unneccessary line.
Revert "One more $if must change to $ifdescr"
This reverts commit a045b3270f13f39908beb875ede4e75f565e12e9.
Not correct.
One more $if must change to $ifdescr