Commit Graph

13003 Commits

Author SHA1 Message Date
Renato Botelho
a9d6ae1734 Merge pull request #1746 from phil-davis/patch-7 2015-07-15 10:20:52 -03:00
Renato Botelho
fe05aacf24 Merge pull request #1747 from phil-davis/patch-8 2015-07-15 10:18:24 -03:00
Renato Botelho
5e3999791f Merge pull request #1749 from phil-davis/cancel-referer 2015-07-15 10:16:07 -03:00
Chris Buechler
ccf504fc30 Merge pull request #1752 from phil-davis/patch-9 2015-07-14 18:25:17 -05:00
Chris Buechler
e65ebe325e Fix adding of VoIP rules from traffic shaper wizard where IP/alias is not
specified.
2015-07-14 17:55:05 -05:00
Phil Davis
cc4d13683e 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.
2015-07-14 19:09:01 +05:45
Phil Davis
5eabad3db3 Cancel button after input error
If there is an input error then the edit page is redrawn showing the
input errors. The HTTP_REFERER becomes the current page, rather than the
true original referer. Then if you click Cancel the current page is just
redrawn.
This change makes the code remember the original referer, so if the user
enters some invalid data, presses Save, reads the input error messages
then presses Cancel they are taken back out to the original page - the
same as if Cancel was used before Save.
2015-07-13 10:53:03 +05:45
Phil Davis
b45537f75b 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.
I fixed the reqdfieldsn array also for relay_mode case, even though it is never used. It looked dodgy the way it was.
2015-07-13 01:25:07 +05:45
Phil Davis
ec4112ddcf 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.
2015-07-13 00:45:37 +05:45
Phil Davis
2f0e31b1aa 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.
2015-07-13 00:28:04 +05:45
Aydın Yakar
1a1d9a8c59 Update index.php 2015-07-07 13:42:28 +03:00
Aydın Yakar
c4b85119f9 Update index.php 2015-07-07 13:39:00 +03:00
Chris Buechler
f2265d88c7 Fix dashboard hardware crypto display where AES-NI is enabled. Ticket 2015-07-06 17:05:19 -05:00
Chris Buechler
10c65c480c Don't check whether the QinQ interface exists when deleting. Unnecessarily
makes QinQ un-deletable where the parent interface no longer exists
(removed, config restored from diff hardware, etc.).
2015-07-06 15:41:49 -05:00
Phil Davis
6135a11fd9 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.
This fixes it.
2015-07-04 00:20:29 +05:45
Renato Botelho
45521d7c75 Remove $array_keys references and use $pkg_info. Spotted-by: phil-davis 2015-07-01 14:33:55 -03:00
jim-p
b75cdd94a7 Encode ca/cert descr in system_certmanager.php 2015-07-01 11:36:22 -04:00
jim-p
b741d2ef00 Encode ca/cert descr in system_certmanager.php 2015-07-01 11:32:25 -04:00
jim-p
234cde4b5d Encode ca/cert/crl descr in system_crlmanager.php 2015-07-01 11:27:43 -04:00
jim-p
28bb81784f Encode ca/cert descr in vpn_openvpn_server.php 2015-07-01 11:19:50 -04:00
jim-p
8bcc385b3a Encode ca/cert descr in vpn_openvpn_client.php 2015-07-01 11:17:45 -04:00
jim-p
d6a94eda00 Encode ca/cert descr in vpn_ipsec_phase1.php 2015-07-01 11:15:31 -04:00
jim-p
a14571438d Encode ca/cert descr in system_authservers.php 2015-07-01 11:14:37 -04:00
jim-p
11df032059 Encode ca/cert descr in system_usermanager.php 2015-07-01 11:12:13 -04:00
jim-p
0d45890317 Encode cert/ca descr in system_advanced_admin.php 2015-07-01 11:11:22 -04:00
jim-p
e67c70a3b3 Encode cert/ca descr in services_captiveportal.php 2015-07-01 11:10:06 -04:00
jim-p
636dfa9528 Encode ca/cert info in openvpn_wizard.inc 2015-07-01 11:07:02 -04:00
Renato Botelho
3d3e30b3a5 Modify pkg_mgr.php to deal with pkg 2015-07-01 11:29:13 -03:00
Renato Botelho
29d84dd47e Fix install_package calls and check for failures 2015-07-01 10:58:57 -03:00
Renato Botelho
6a3380dd99 Remove old and unnecessary code 2015-07-01 10:22:57 -03:00
Phil Davis
f3ec49e148 Only process Traffic Graph object if it is open
The Traffic Graphs widget puts a graph object for every interface into
the HTML of the widget. Underneath the graph object for every interface
makes the call to graph.php to get data for the graph, and the refresh
interval also keeps happening, which keeps gathering the data every
refresh interval for every interface.
This wastes a lot of CPU back on the pfSense box gathering data
repeatedly if the system has a lot of interfaces and only has the
Traffic Graph enabled for 1 or a few of them. e.g. on my poor little
Alix at home I had setup 6 VLANs to test some stuff, so I had WAN, LAN,
OPT1 and 6 tagged VLANS - 9 interfaces. When I enable the Traffic Graphs
widget on the dashboard, the Alix CPU is driven 100% trying to keep up
with gathering data for 9 interfaces every 10 seconds, even though I
only have 1 graph actually opened!
I couldn't see a way to enable/disable the graph.php object from
executing. So this change puts the object in and out of the HTML:
a) At first display the graph.php object HTML is only put in the
relevant "div" if the graph is actually set to be shown in the config.
b) When a graph is opened by the user, the Java Script puts the
necessary graph.php object HTML into the div. The graph data then starts
being requested...
c) When a graph is minimised by the user, the Java Script removes the
graph.php object HTML from the div. The actions of graph.php stop
happening.
I can see the difference by just watching "top" from the command line on
a low-power system and open/minimizing the graphs on the dashboard.
If there is a better way to enable/disable an object like this I am
happy to learn about it.
2015-06-26 16:40:06 +05:45
Renato Botelho
608f682881 Merge pull request #1717 from phil-davis/traffic-graph-description 2015-06-25 10:22:02 -03:00
Renato Botelho
72e2a4283a Merge pull request #1725 from phil-davis/gateways-widget 2015-06-25 09:39:11 -03:00
Renato Botelho
03e4bd0c14 Merge pull request #1730 from phil-davis/patch-2 2015-06-25 08:48:53 -03:00
Renato Botelho
7d6b8b9bee Merge pull request #1729 from phil-davis/widget-iform 2015-06-25 08:47:56 -03:00
Renato Botelho
aa676b7549 Merge pull request #1719 from N0YB/XHTML_Compliance_Diagnostics_Tables 2015-06-25 08:29:54 -03:00
Phil Davis
90ad3a76ed 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.
This change displays the settings automatically, if there is something already specified. It works the same way as the Firewall Rules advanced boxes.
2015-06-24 22:45:40 +05:45
Phil Davis
9a3ec939f9 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 name
repeated, not id. And nothing was using these names.
Traffic Graphs widget was using just "iform". That is a bit dangerous
for the future. I got tricked when cut-pasting some code to make some
settings options for the Gateways widget. I kept "iform" and then
wondered for a while why my Traffic Graphs widget show-hide settings
would not save. There was traffic graph JS that referred to just "iform"
and that started modifying the "iform" in my new Gateways widget code.
Rather than having names "iforma", "iformb"... "submita", "submitb"...
it seems much less risk of accidental duplication if these are named
like:
name_of_widget_iform
name_of_widget_submit

I don't think there is any user-visible bug in 2.2.* - so this
standardization could just go into 2.3
2015-06-23 13:13:07 +05:45
Phil Davis
6538d33af8 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.
This fixes it.
2015-06-23 11:38:53 +05:45
Phil Davis
be253f60af Add DNS host override descriptions
since we can sometimes provide a useful description from that config
data also.
Fill the $iplookup array with host or FQDN data if description is blank
or host or FQDN was requested. Then we can use $iplookup in all cases
where we have local data. It simplifies some logic a bit.
2015-06-22 13:05:35 +05:45
Phil Davis
3d0391f1d8 Display monitor IP on Gateways widget
This change adds a setting for the Gateways dashboard widget so the user
can choose to display the Gateway IP, Monitor IP or both.
If "both" is chosen and the Gateway IP is the Monitor IP, then only the
Gateway IP is shown - i.e. the same IP address is not repeated on the
widget display.
If "both" is chosen and the Monitor IP is different to the Gateway IP
then the Monitor IP is shown in () brackets after the Gateway IP.
If "Monitor IP" is chosen and there is no special Monitor IP defined,
then the Gateway IP is displayed (which is also the Monitor IP).
If "Gateway IP" is chosen then the widget behaves as it does now.
"Gateway IP" is the default.
I find this handy because the Gateways widget reports RTT (latency) and
loss figures that are actually for pings to the Monitor IP. So it seems
useful to be able to display the Monitor IP in the widget.
2015-06-20 00:00:15 +05:45
Ermal LUÇI
3378289af3 Ticket #4746 Correctly set global variables to be used by hostnames cod epaths 2015-06-19 17:35:31 +02:00
jim-p
55a1435e45 Add a GUI field to increase the pf frag entries limit. Fixes ticket #4775 2015-06-18 09:33:36 -04:00
Phil Davis
a7c28e996c 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.
Note: This stuff has no gettext() wrappers - but that can be fixed later, not get mixed up in this.
2015-06-16 12:42:01 -05:00
Phil Davis
84a2e91548 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...
Maybe that was supposed to happen?
Anyway, I thought I would point this out and someone can either commit this pull request if the "break" should be there, or explain to me why "reinstallxml" is supposed to fall through executing all this code.
2015-06-16 22:40:23 +05:45
jim-p
ab2fd59d63 Encoding in services_unbound_advanced.php 2015-06-16 12:11:57 -04:00
jim-p
a5e950ae27 Encoding in system_advanced_sysctl.php 2015-06-16 12:02:36 -04:00
jim-p
df6a9c6d7c Encoding in interfaces.php 2015-06-16 11:54:41 -04:00
jim-p
e08298127d Encoding in services_unbound.php 2015-06-16 11:45:56 -04:00
jim-p
55f6b38bca Encoding in pkg_mgr_settings.php 2015-06-16 11:42:07 -04:00