Merge branch 'master' into bootstrap
Conflicts: usr/local/www/head.inc usr/local/www/themes/_corporate/styles/jquery-ui-1.11.1.css
Make sure radvd is reconfigured when CARP is enabled/disabled. It should fix #4252
Conflicts: usr/local/www/carp_status.php usr/local/www/diag_arp.php usr/local/www/diag_authentication.php
Ticket #3997 s/_vhid/_vip/g
Ticket #3997, teach code to track carp through uniqids(). Missing carp GUI changes and upgrade code
Conflicts occured in copyright message (year-update) due to whitespace difference and themes/ which was removed
re-added shortcuts/, global tpl updates
initial drag/drop WIP, working on backup/restore page
Welcome 2015
clarify message here after customer feedback, it wasn't meant to imply "only a reboot will re-enable" but that's how some people have read it.
Cleanup aliases when temporarily disable CARP, fixes #4116
modify copyright statement to reflect reality
Change copyright statement to reflect reality
Fix syntax error in CARP status page. Ticket #3967
Ticket #3967. Allow to have carp as parent of ipaliases - continued
rename interfaces_carp_setup to interfaces_sync_setup and call it during bootup since it does not only relate to carp interfaces.
Fixes #3909 Properly report and detect carp_status
Convert almost all /sbin/sysctl calls to php functions
Fix indent
Fix typo
Tidy up "carp_status.php" XHTML
Add SUMMARY to TABLESClose INPUT tags and IMG tags and ALT to IMGTidy up CENTER tagsAdd missing closing FORM tag
Key off net.inet.carp.demotion and display a warning to the user if the system has self-demoted its CARP status.
Fix text, capitalization, and change wording to put more focus on how the action behaves.
carp, provide a way to 'permanently' set carp to 'maintenance mode' (advskew 254) persisting a rebootOption to set CARP interfaces to 'maintenance mode', persisting through a reboot so the primary machines stays as backup/inactive.This is required when there are some problems (possibly with the hardware) and the primary machine needs to be booted and checked again before becoming 'master'. Currently it will take back the master state during reboot even though there might still be problems or some re-configuring to do....
xhtml Compliancereplaced <br>, <br/> and </br> with <br />
Use _vip as identified for CARP vip IPs to allow easier upgrade code. This way only ipaliases on carp need to be upgraded.
Provide proper interface for getting carp status
Remove references to _vip interface and provide proper configuration for carp on FreeBSD 10. Still some places to deal with this and certainly missing upgrade code
Activate new shortcuts/status in the rest of the areas that are currently setup.
Get rid of carpdev, it will never be
Make vips vhid be unique per parent interface!
Move CARP settings from pkg XML to a real PHP page
https://redmine.pfsense.org/issues/647
Ticket #1598. Correctly handle ipalias vips when re-enabling carp from the carp_status screen.
Note that disabling does not survive a reboot
Expose advbase option of carp(4) to alleviate advanced configs.
Initialize variable. Ticket #1023.
Ticket #1023. Correct carp status even on the status page.
Small gettext() fixes
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/carp_status.php usr/local/www/diag_nanobsd.php usr/local/www/services_captiveportal_ip_edit.php
Implement gettext() calls on carp_status.php
Fixes #761. Remove some wrong copy/pasto code.
Fixes #761. Correctly bring down/up all vips based on the button click in the webGUI.
only match with a space behind the IP, otherwise 10.0.0.6 CARP IP may match against interface IP 10.0.0.60, and show incorrect info on the CARP status page
Don't use a fake CARP VIP name since it doesn't match up with the new style names, which are already properly obtained in this code block.
Check for an array here to prevent against a foreach error showing in the GUI.
s/interfaces_carp_configure/interfaces_carp_setup/
Move newer xmlreader code to xmlreader.inc. Restore old xmlparse code to xmlparse.inc. Default to the older xmlparse.inc but add a flag check if /cf/conf/use_xmlreader is present the newer code will be included instead until the remaining bugs can be resolved with it (see rcs for many).
Unbreak CARP Enable/Disable button
Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on
Turn common tabular data areas into sortable items. Revert the sortable.js change that used tabcont and change back to sortable
Unbreak dhcp lease sorting
It makes no sense to show a enable/disable button when no carp interfacesare configured. Do not show it under these conditions.
Make page look OK when no carp interfaces are defined.
Rewrite the pfsense privilege system with the following goals in mind ...
1) Redefine page privileges to not use static urls2) Accurate generation of privilege definitions from source3) Merging the user and group privileges into a single set4) Allow any privilege to be added to users or groups w/ inheritance...
Eliminate interfaces_carp_bring_up_final()
Remove (FAILOVER)
touch up text
remove annoying and potentially problematic forced page refresh.
Ticket #1545
Switch over to array style page titles. Obtained-from: m0n0wall
changed text for consistency
Ensure CARP cache is cleared on status page reload.
MFCs/PHP_SELF/SCRIPT_NAME/ - PHP_SELF == "" for some reason with lighty
Remove #!/usr/local/bin/php
MFC 8621Minor proofreading.
Bring up carp interfaces after changes
link directly to carp settings screen, not to VIP screen
Adjust carp bootup sequence. Do not down the interfaces and later up them.
More refresh patches from databeestje
just cleaning house ... took javascript out of carp_status.php
some crosslinking to "fly" from corrosponding setting to logs, diags and back
updating files to use theme imagesremoving images from /usr/local/wwwadding specific images into the correct theme directories
Round the top corners
Move CARP around - it's no longer a "service" status shows under status menu and all settings are under virtual ips
remove carp VIP tab - it's no longer needed
Merge in virtual IP codeThis changeset does the following: merges proxy arp and carp setup menus removes proxy arp menu from left side upgrades config file from 1.7 to 1.8 moves existing carp virtual IP and proxy arp config to new <virtualip> tag...
Use a unique name to fix the top line.
Fix curvy features
Fix bottom rounds
Remove extra >
Missing page title
include head.inc and round corners on tabs
<br> before alerting that we didn't locate any CARP interfaces
Don't chop off footer table elements
no need to declate
Include the remaining portion of the page if no carp addresses are available
require -> require_once
xmlparse_pkg.inc -> xmlparse.inc
Move carp to base