pfSense

Use

Add quotes back that were incorrectly removed when implementing gettext and add php tags around gettext where needed.

Merge remote branch 'mainline/master'

Conflicts:
usr/local/www/status_captiveportal.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_wireless.php

add tooltip. cvstrac 1640

Implement gettext() calls on status_captiveportal.php

Include commonly used .inc files such as filter.inc, shaper.inc, etc

call first tab "Active Users", and make it consistent

Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on

Add missing Location:

Redirect back to cp page after disconnection of user

Lock around read call

Modify sortable.js to work on tabcont as opposed to sortable class. This has the effect of making any table that has a single header sortable instead of having to visit each page. Sponsored-by: BSD Perimeter Commercial Support

• Convert captive portal rules to use tables. This reduces the number of rules ALOT.
• Make the peruserbw setting use tables also by taking advantage of the tablearg option.
• Convert statistics to use the new improvements of ipfw tables merged previously....

Port voucher login ability on CaptivePortal from M0n0Wall.

Various locking fixes are done with the import and this means that as of now pfSense has a better performin/behaving CP than m0n0wall.

Handle the case when no user has logged in. Reported by: http://forum.pfsense.org/index.php/topic,16382.0.html

Check for blank lines and ignore them.

A better fix to empty lines.

Propperly check for empty slots. Fix by forum user: itsmorefun!

Speedup noticably CP status page. Previously during load it would not show anything and this commit fixes it.

The other half of CP locks conversion to new locking functions.

Rewrite the pfsense privilege system with the following goals in mind ...

1) Redefine page privileges to not use static urls
2) Accurate generation of privilege definitions from source
3) Merging the user and group privileges into a single set
4) Allow any privilege to be added to users or groups w/ inheritance...

remove {$concurrent}, it breaks user manager.

Switch over to array style page titles. Obtained-from: m0n0wall

Sync w/ HEAD

Backport username display feature in captive portal. Really not sure why it wasn't included in RELENG_* versions.

MFC
s/PHP_SELF/SCRIPT_NAME/ - PHP_SELF == "" for some reason with lighty

Add sortable table header support

Remove #!/usr/local/bin/php

MFC 6960
Cleanup hardcoded meta refreshes

Show the current amount of authenticated captive portal users in the Status: Captive Portal line such as:

Status: Captive Portal (250)

Used at KCD extensively to see how many students are authenticated.

updating files to use theme images
removing images from /usr/local/www
adding specific images into the correct theme directories

Refresh Captive Portal status every 60 seconds

Use $pgtitle
small code cleanups

include head.inc and round corners on tabs

Add $Id$ tag

Initial revision