summaryrefslogtreecommitdiffstats
path: root/etc/inc/pfsense-utils.inc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'jim-p2011-07-121-24/+24
|\ | | | | | | | | | | | | | | | | | | | | 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 incVinicius Coque2011-06-071-0/+38
| |\ | | | | | | | | | | | | | | | Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
| * \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-231-9/+35
| |\ \
| * \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-231-2/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
| * \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-251-22/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 etc/inc/shaper.inc etc/inc/voucher.inc etc/inc/vpn.inc usr/local/www/fbegin.inc
| * \ \ \ \ Merge branch 'master' into incVinicius Coque2011-01-281-4/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 etc/inc/system.inc etc/inc/voucher.inc
| * \ \ \ \ \ Merge remote branch 'mainline/master' into incVinicius Coque2010-12-141-77/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 etc/inc/shaper.inc etc/inc/upgrade_config.inc etc/inc/xmlparse.inc usr/local/www/fbegin.inc
| * \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-161-11/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
| * \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-111-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/authgui.inc
| * | | | | | | | | Fix quotes to use %N$X on gettext callsRenato Botelho2010-10-011-6/+6
| | | | | | | | | |
| * | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-09-281-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-09-131-10/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc etc/inc/gwlb.inc
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-09-081-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc
| * | | | | | | | | | | | Fix gettext calls with printf to permit change strings orderRenato Botelho2010-08-301-6/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-08-201-34/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-08-181-65/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc
| * | | | | | | | | | | | | | Implement gettext() calls on pfsense-utils.incCarlos Eduardo Ramos2010-08-161-31/+31
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix merge blip.jim-p2011-06-011-4/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote branch 'upstream/master'jim-p2011-06-011-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 systemScott Ullrich2011-05-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add function headerScott Ullrich2011-05-251-0/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adding a new hook system for firewall nat edit and firewall rules edit page.Scott Ullrich2011-05-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 /usr/local/pkg/firewall_nat/htmlphplate /usr/local/pkg/firewall_rules/input_validation /usr/local/pkg/firewall_rules/pre_write_config /usr/local/pkg/firewall_rules/htmlphpearly /usr/local/pkg/firewall_rules/htmlphplate
| * | | | | | | | | | | | | | * Add is_ipaddr_configured() so that people do not need to reinvent the ↵Scott Ullrich2011-05-251-1/+18
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wheel for this task * Check to make sure the administrator is not entering the IP address of the same host preventing a issue where the firewall will sync the voucher database to itself and cause the webConfigurator to crash.
* | | | | | | | | | | | | | Apply fix from wallabybob on the forum ↵Seth Mos2011-05-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://forum.pfsense.org/index.php/topic,37079.0.html
* | | | | | | | | | | | | | Merge remote branch 'upstream/master'jim-p2011-05-201-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Correct code to use correct refernces for proxy settings set in ↵Ermal2011-05-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: ↵Ermal2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://forum.pfsense.org/index.php/topic,36939.0.html
| * | | | | | | | | | | | | Resolves #1529. Check if the file exists before opening it.Ermal2011-05-141-1/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Resolves #1529. Check if the file exists before opening it.Ermal2011-05-161-1/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into smos-ipv6Bill Marquette2011-05-141-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/pfsense-utils.inc
| * | | | | | | | | | | | | Fix small typoEvgeny2011-05-141-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | MAC prefix to vendor resolution at Status->Interfaces, Status->DHCP leases, ↵Evgeny2011-05-141-0/+24
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diagnostics->ARP table
* | | | | | | | | | | | | Merge remote branch 'upstream/master'Seth Mos2011-04-281-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/pfsense-utils.inc
| * | | | | | | | | | | | Add an option under advanced->misc to specify a proxy for retreiving pfsense ↵Ermal2011-04-181-3/+26
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package info or downloading packages.
* | | | | | | | | | | | Fix parse errorSeth Mos2011-03-221-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Restore the IPv6 counters I accidentally overwroteSeth Mos2011-03-221-18/+31
| | | | | | | | | | | |
* | | | | | | | | | | | Add a function that will calculate the ipv6 address for a given hardware addressSeth Mos2011-03-201-29/+51
| | | | | | | | | | | |
* | | | | | | | | | | | Merge commit from Bill M for ipv6 counters and interface statsSeth Mos2011-03-201-17/+29
| | | | | | | | | | | |
* | | | | | | | | | | | Merge remote branch 'upstream/master'Seth Mos2011-02-161-18/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Suppress curl errors (if we get a 404 it tosses its own error if there is no ↵jim-p2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response body, just a 404 code.)
| * | | | | | | | | | | Make update check a little more robust. Timeout after a few seconds, and if ↵jim-p2011-02-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we get a non-200 http code, ignore the response.
| * | | | | | | | | | | In update_alias_names_upon_change function add capability to access more ↵Erik Fonnesbeck2011-02-131-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deeply nested sections and fields.
* | | | | | | | | | | | Merge remote branch 'upstream/master'Seth Mos2011-02-111-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Generalize pppoe server enabled check and use it elsewhere in the GUI that ↵jim-p2011-02-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed fixed. Still needs changes in filter.inc - Ticket #1243
* | | | | | | | | | | | Merge remote branch 'upstream/master'Seth Mos2011-02-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix a date compare bug, resolves #1273jim-p2011-02-101-3/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge remote branch 'upstream/master'Seth Mos2011-01-181-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/system.inc
| * | | | | | | | | | Scroll the textarea to bottom on each updateScott Ullrich2011-01-061-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Take into account< 10 tooScott Ullrich2011-01-061-2/+2
| | | | | | | | | | |
| * | | | | | | | | | When installing packages on console (downloading) only show every 10% ↵Scott Ullrich2011-01-061-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meaning 10% 20% 30% instead of 1% 2% 3% 4% 5%, etc
OpenPOWER on IntegriCloud