Allow pre-filling (but no automatic action) of the download filename on exec.php. Setup a link to download the status output.tgz in status.php
Fix caps
Bug #4551 - consistent usage of Forwarder/Resolver across the WebGUI
Clarify that this applies to DNS Resolver as well. Update the translations template.
Clarify that this applies to DNS Resolver as well.
Merge pull request #1738 from phil-davis/Static-Routes
Switch logic of $disabled tests system_gateways
Fix Firewall - Aliases GUI inconsistencies for URL Table type aliases
The GUI should show descriptions according to what's selected from the dropdown, but currently does not for URL Table (IPs) and URL Table (Ports) type of aliases.
Merge pull request #1758 from phil-davis/patch-2
Revert "myid_data and peerid_data fields are not relevant with asn1dn."
This reverts commit 0e19c4bba659a5f4d28f9c8b20c80717a90964b9.
myid_data and peerid_data fields are not relevant with asn1dn.
Conflicts: usr/local/www/vpn_ipsec_phase1.php
Remove old, unused NetUtils.js
Restrict serial ports glob to cua followed by alpha
Improve this a little more to match only alpha after /dev/cua (/dev/cuau for example)
Make serial ports glob cope with many more possibilities
It originally coped with things like cuau1 cuau1.1Then I made it cope with things like cuau1 cuau11 but it stopped working for cuau1.1This one copes with:cuau1cuau1.1cuau1.11cuau11cuau11.1cuau11.11...
Merge pull request #1742 from phil-davis/patch-3
Merge pull request #1743 from phil-davis/patch-4
Merge pull request #1745 from phil-davis/patch-6
Merge pull request #1746 from phil-davis/patch-7
Merge pull request #1747 from phil-davis/patch-8
Merge pull request #1749 from phil-davis/cancel-referer
Merge pull request #1752 from phil-davis/patch-9
Fix adding of VoIP rules from traffic shaper wizard where IP/alias is notspecified.
Fix glob for serial device names
Removing the "." that was in {,.[0-9]} allows it to match /dev/cuau10 and onward.I added lots of comments on the glob expression, because the format of the glob expression is not the same as an ordinary regex.
Cancel button after input error
If there is an input error then the edit page is redrawn showing theinput errors. The HTTP_REFERER becomes the current page, rather than thetrue original referer. Then if you click Cancel the current page is justredrawn....
Fix references to Load Balancer Virtual Server redirect_mode
When adding a Virtual Server, if you press Save with blank fields, the validation does not show. That was because the switch statement selecting the fields to validate had wrong case values. Actually the "mode" here is locked to "redirect_mode" (later code to allow the mode to be selected by the user is commented out - not implemented....
Interfaces PPPs edit avoid foreach() warning
If you go to Interfaces, assign, PPPs, press "+" to add an entry, then press Save without entering anything then you get a warning about the foreach() here.The is_array() check fixes it.
Interfaces GRE Edit fix required fields text
The reqdfields had only 4 entries but reqdfieldsn has 5 entries and the field names to text descriptions did not match up.Fixed it.
Interfaces GIF Edit fix do_input_validation
Make the required fields be correct and match thier text names, which should each have their own gettext() cal so as to build a proper array at line 81. Basically it was all broken and the errors displayed when field/s were left empty were rubbish.
Firewall Aliases Edit ensure input_addresses array exists
If you click "+" to add an alias, then press Save without entering anything, you get:Warning: Invalid argument supplied for foreach() in /usr/local/www/firewall_aliases_edit.php on line 402as well as the various messages related to $input_errors....
Firewall Aliases Import display error message for invalid alias name
If you open firewall_aliases_import and enter just an invalid Alias Name (e.g. a$b) and press save or press save with all fields empty, then the screen redraws but the input error(s) is not displayed....
Static routes merge "else" and "if" into "else if"
As suggested by Renato.
Update index.php
Fix dashboard hardware crypto display where AES-NI is enabled. Ticket
Don't check whether the QinQ interface exists when deleting. Unnecessarilymakes QinQ un-deletable where the parent interface no longer exists(removed, config restored from diff hardware, etc.).
Fix #4813 validation of enable/disable of gateways and static routes
1) A disabled gateway can always be enabled - no extra validationneeded.2) When disabling an enabled gateway, check to see that the gateway isnot used in any gateway group or enabled static route (similar tests to...
Fix put static route destination in config change description
When enabling or disabling a route by using the enable/disable button on the Routes page, the destination network was not being put in the config change description, although the code intended it to be there....
Remove $array_keys references and use $pkg_info. Spotted-by: phil-davis
Encode ca/cert descr in system_certmanager.php
Encode ca/cert/crl descr in system_crlmanager.php
Encode ca/cert descr in vpn_openvpn_server.php
Encode ca/cert descr in vpn_openvpn_client.php
Encode ca/cert descr in vpn_ipsec_phase1.php
Encode ca/cert descr in system_authservers.php
Encode ca/cert descr in system_usermanager.php
Encode cert/ca descr in system_advanced_admin.php
Encode cert/ca descr in services_captiveportal.php
Encode ca/cert info in openvpn_wizard.inc
Modify pkg_mgr.php to deal with pkg
Fix install_package calls and check for failures
Remove old and unnecessary code
Only process Traffic Graph object if it is open
The Traffic Graphs widget puts a graph object for every interface intothe HTML of the widget. Underneath the graph object for every interfacemakes the call to graph.php to get data for the graph, and the refresh...
Merge pull request #1717 from phil-davis/traffic-graph-description
Merge pull request #1725 from phil-davis/gateways-widget
Merge pull request #1730 from phil-davis/patch-2
Merge pull request #1729 from phil-davis/widget-iform
Merge pull request #1719 from N0YB/XHTML_Compliance_Diagnostics_Tables
Display any advanced DHCP server settings
when the page is first displayed.This has annoyed me a few times and it annoyed me again just now. I had some settings in one of the advanced boxes that were no longer wanted, but when the services_dhcp page is shown the contents of advanced settings are not shown to the user - the user has to click on each advanced button to see if there are any settings already there....
Standardize widget iform and submit names
The log and picture widgets were both using "iforma" and "submita".Actually it did not break anything because it was only the form namerepeated, not id. And nothing was using these names.Traffic Graphs widget was using just "iform". That is a bit dangerous...
GW widget input form name-id needs to be unique
among all widget forms.Traffic Graphs widget already uses the vanilla name "iform". Reusing that name causes Traffic Graphs widget graph display state (show/hide) not to be saved if GW widget was also displayed on the dashboard....
Add DNS host override descriptions
since we can sometimes provide a useful description from that configdata also.Fill the $iplookup array with host or FQDN data if description is blankor host or FQDN was requested. Then we can use $iplookup in all cases...
Display monitor IP on Gateways widget
This change adds a setting for the Gateways dashboard widget so the usercan choose to display the Gateway IP, Monitor IP or both.If "both" is chosen and the Gateway IP is the Monitor IP, then only theGateway IP is shown - i.e. the same IP address is not repeated on the...
Ticket #4746 Correctly set global variables to be used by hostnames cod epaths
Add a GUI field to increase the pf frag entries limit. Fixes ticket #4775
Say what is happening when reinstalling package GUI XML
At the confirmation dialog after pressing the "Reinstall XML" button, the text does not distinguish between having pressed "Reinstall the whole package" and "Reinstall the GUI/XML". It would be nice if the text of this confirmation allowed the user to be confident about which button they had just pushed, before confirming the action....
Why is break missing for reinstallxml
I thought that "reinstallxml" should do less than "reinstallpkg" but actually it was getting stuff here, then falling through "reinstalpkg" which did delete_package_xml and then install_pkg, which got the files a 2nd time and......
Encoding in services_unbound_advanced.php
Encoding in system_advanced_sysctl.php
Encoding in interfaces.php
Encoding in services_unbound.php
Encoding in pkg_mgr_settings.php
Encoding in system_advanced_admin.php
Encoding in interfaces_ppps_edit.php
Encoding in diag_packet_capture.php
Encoding in interfaces_qinq_edit.php
Encoding in services_dnsmasq.php
Encoding in vpn_ipsec_settings.php
More encoding
Fix some low-hanging potential security issues.
Be more careful with encoding on pages that use single quotes around HTML attributes
Additional encoding for system_advanced_misc.php
Protect single quotes as well to prevent JS injection, due to the way this page uses single quotes for attributes.
Encode parameters in system_advanced_firewall.php before displaying back to the user.
Add semicolon
Fix delete Java Script to match valid HTML ID
Merge pull request #1722 from chapmajs/fix_hughesnet_pd
Fixing PD size selection for HughesNet
Remove the GUI for the pc-sysinstaller as well and add it to obsoletee files
Merge pull request #1721 from phil-davis/style
Code spacing
and other random stuff I noticed.I think this finishes messing with code style. The codebase should matchthe developer style guide closely enough that 99.9% of changes will notfeel the need to also massage the formatting.
XHTML Compliance
html id's not permitted to begin with a number.html id's not permitted to contain '/'add prefix (entry_) and replace slash with hyphen.table entry id format becomes: entry_<ip address>-<cidr>replacing the format: <ip address>/<cidr>does not change the displayed format.
status_queues missing semi-colon
This really looks like it should have a semi-colon. Somehow the PHP interpreter is not being fussy about it in this context, I guess being followed by the "endif;" keyword the interpreter guesses the previous statement must be done.
Ticket #4655 well manually merge pull/1715. Thanks: Phil
add input validation for proxy URL, port, user.
Conflicts: usr/local/www/system_advanced_misc.php
Ok another round of this which unbreaks input error validation messages
Make this right finally :). Thanks-ti: Phil-davis
Activate the redirection that for some reason got disabled
Add description as a display option on Traffic Graph
This is handy at sites where lots of the LAN clients have static-mappedDHCP IP addresses. Depending on the site host naming conventions, hostnames can be a bit obtuse - may not tell you where the client device...
Ticket #4655 Do not behave against the logic of checkbox and description.
fix checking for overlaps of NAT destination port