Code style etc inc vwx3
rebased version with conflicts resolved due to a bunch of recent changesin vpn.inc
Random text typos
that I noticed.
Fix lineup of copyright lines
and module names and other bits of formatting and typos in headercomment sections.
Rather than set the g['booting'] on globals provide a function to test for that doing the right checks
Make the voucher auth through xmlrpc work.
Properly detect when there are issues with communicating with syncip and to use the local DB for this. Otherwise detect if the remote says the voucher is not valid say its not valid.
Be friendly to memory
Fix problem with the voucher synching that was introduced during conversion to zones
While here unset some variables even on vouchers side
Reduce the total minutes by the remote minutes used, do not use the value directly. Otherwise the voucher will be cut short or listed invalid when it otherwise should have time left over.
Fixes #3001, Check the protocol of the webgui to determine if https is being used for custom ports.
Revert "Merge pull request #417 from miken32/cp-database-fix"
It breaks customizations, it's not a good time for such big change.
This reverts commit 40c7b1a98bfdc61261154adaac5fdefc234ecb08, reversingchanges made to d896f86751bae79625197da6c80d709fdf185448.
use associative array for captive portal to prevent confusion, messiness, and abuse
Actually let xmlrpc construct the url internally from the passed info it is doing same checks
Avoid possible deadlock during voucher xmlrpc sync and correct url generation for xmlrpc
Update /etc/inc/voucher.inc
Update etc/inc/voucher.inc
Fix array initialization as noted by 'elratt0r' in http://forum.pfsense.org/index.php/topic,49799.0.html
rename for clarification
serialize dbent array
Fix: Voucher Sync
If there is no roll do not try to save anything
Convert the CP db to sqlite rather than a text file. Some more optimizations might be needed and probably vouchers db might need conversion as well.
Update copyright
Fix wich roll to write
Ticket #2114. Remove define_syslog_variables since its deprecated and probably not needed
The function split() is replaced by the function explode(). Starting with PHP 5.3 this is deprecated and with version 6 gone.Replacing it surpresses all the warnings
Issue proper start and error messages during voucher loading
fix typo (Bug 1944)
fix typo. redmine #1941
Remove duplicated occurence during merging
Add the multi instance CP to master branch. This allows to define CP with different properties on different interfaces.
Another roll at fixing the voucher sync problems.
Fix php behaviour on xmlrpc sync and vouchers starting with a number. Apparently php uses that to deduce the type of var and gets confused.
removes variables concatenation on gettext strings
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/priv.defs.inc
If vouchers are disabled do not allow users to authenticate thorugh existing(active/in use) vouchers. Reported-by: http://forum.pfsense.org/index.php/topic,38342.0.html
Fixes #1327. Trigger synching of vouchers to config through check_reload_status. Retire the saveinterval option since it is not useful anymore. Use the prune process of captiveportal to sync vouchers as well to fix issues as reported-by: http://forum.pfsense.org/index.php/topic,37636.0.html
Disconnect any voucher forced to expire if there are active sessions with it.
Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
Provide a voucher_expire function so that voucher can be expired through a POST.
Update some code to be more readble and more compliant to php5
Test for array before using variable as one.
Conflicts: etc/inc/voucher.inc
Make the return values on error consistent with the normal return value.
Actually correctly report the timeleft in log messages. This is mostly cosmetic.
Correctly synchronize the db of vouchers from master. Also correctly write it to the files since before it is only allowed during bootup and not from xmlrpc.
Correct log messages to not display port twice.
Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
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 voucher disconnect sync issue
Do a proper test otherwise a override of the total_minutes var might happen.
Properly do testing of voucher existing or not rather than relying on an obscure feature of php. Also do exclusive locking rather than shared one when writing dbs.
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...
Include captiveportal.inc if captiveportal_syslog() is not defined.
Use captiveportal_syslog()
White space fixes and (C) for both Ermal and myself
Log voucher errors. Fix whitespace. Remove trailing c/r
Safe belts to avoid errors.
Fix condition that needed to be negated after a recent layout change here and prevent a PHP warning if there are no voucher rolls. Fixes #1106
Make voucher xmlrpc error checking the same as others.
Ticket #1087. Cleanup whitespace and also do not rely on having the db dirty flag set for backing up the dbs but always do this!
Cleanup of whitespace and use exclusive lock during reconfiguration of vouchers.
Fix typo
Fix quotes to use %N$X on gettext calls
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc
Check for less time available on remote node
Only make one XMLRPC call
Sync rolls if needed. This might be required if the operator removed/added or changed the rolls on the master node
Fix gettext calls with printf to permit change strings order
Conflicts: etc/inc/captiveportal.inc
Add Captive Portal voucher database sync to secondary nodes. How this works is you designate one of your access points with a voucher database as the master and then on the slave nodes you setup the 4 fields on the voucher edit screen. This will then sync the voucher database and anytime someone attempts to authenticate the slave nodes will use XMLRPC over to the master node to ensure that the voucher has not been used, etc....
Conflicts: etc/inc/interfaces.inc
Resolve issue where used variable might be an array (multiple voucher rolls)
nuke trailing c/r
Fix gettext on voucher.inc
Implement gettext() calls on voucher.inc
Ticket #351. Prevent wrong config.xml creation.
Ticket #350. Correct calculation to be the same as in the voucher_auth.
Rework includes/require. This saves about 4 megabytes.Simplify get_memory(). Tested on mips/i386
Fix Bug #147.
yes, I'll even fix typos in comments
Add pfSense_BUILDER_BINARIES: and pfSense_MODULE: additions
Convert even voucher to the new subsystem_dirty functions. This reduces another global.
Fix various issues reported on http://forum.pfsense.org/index.php/topic,8672.0.html.
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.