Commit Graph

34 Commits

Author SHA1 Message Date
Renato Botelho
c833432e7f Use git instead of git-lite 2015-09-03 17:48:38 -03:00
Jared Dillard
517071cc63 Revert "convert old icons to glyphicons"
This reverts commit 02274bf8aa.
2015-09-02 15:00:58 -05:00
Jared Dillard
02274bf8aa convert old icons to glyphicons 2015-09-02 14:59:19 -05:00
Renato Botelho
a5c53d2621 Do not explicit add opcache to zend_extension, just enable or disable it 2015-09-01 10:43:24 -03:00
Renato Botelho
7f59ae0410 Merge pull request #1824 from phil-davis/dhcp-pools-range 2015-08-28 10:41:47 -03:00
Renato Botelho
71de40d4ee Merge pull request #1826 from phil-davis/v10-bigger-than-v9 2015-08-28 10:40:30 -03:00
Renato Botelho
51094ffe85 Merge pull request #1833 from doktornotor/patch-5 2015-08-28 09:59:48 -03:00
Renato Botelho
805974e344 Merge pull request #1821 from phil-davis/upgrade-config 2015-08-28 09:36:08 -03:00
doktornotor
9d0a71fbac mail.php code style
Resubmit of #1813 since noone picked it up yet, LOL.
2015-08-28 14:36:01 +02:00
Renato Botelho
1bdbf0406b Merge pull request #1825 from phil-davis/newer-release 2015-08-28 09:30:08 -03:00
Renato Botelho
fc9a67bc0a Merge pull request #1828 from doktornotor/patch-7 2015-08-28 09:29:28 -03:00
Renato Botelho
53ca09c8f1 Merge pull request #1830 from doktornotor/patch-6 2015-08-28 09:28:24 -03:00
doktornotor
0357ecfc68 Declare the harddisks variable only if needed 2015-08-28 14:22:03 +02:00
doktornotor
c0020b978b Indentation fix 2015-08-28 14:19:29 +02:00
doktornotor
a60c170049 Re-enable hard disk standby (Bug #4569) 2015-08-28 14:03:48 +02:00
doktornotor
3e4f8fc4f4 Bug #4569 - system_set_harddisk_standby() rewritte for current CAM-based ATA stack
Resubmit of #1767
2015-08-28 13:52:04 +02:00
doktornotor
6036c8a007 remove routed service, is being handled by the package
Resubmit of #1817. See pfsense/pfsense-packages#1006
2015-08-28 13:34:14 +02:00
doktornotor
8fe38524d5 make sure that cron is running before reconfiguring it
This is a resubmit of #1814.

(When cron goes away for whatever reason, you can keep reconfiguring it till blue in face but nothing will happen.)
2015-08-28 13:30:17 +02:00
Renato Botelho
aee36a292a Remove ioncube references from php.ini, and set zend_extensions properly 2015-08-27 10:02:03 -03:00
Renato Botelho
3e9127fad7 Move opcache to zend_extensions 2015-08-27 09:56:37 -03:00
Renato Botelho
da37f12917 Update gitsync description for branch master, spotted by @phil-davis 2015-08-27 08:55:28 -03:00
Renato Botelho
03b565250a Obsolete use of /etc/nano_use_vga.txt, Use enableserial_force flag instead 2015-08-27 07:49:49 -03:00
Renato Botelho
5563e8ba73 Make gitsync work with new repo structure, copying files under src/. It should fix #4999 2015-08-27 07:23:08 -03:00
Renato Botelho
bcee456cb1 Remove duplicate parameter 2015-08-27 07:21:49 -03:00
Renato Botelho
1b875052c9 Fix indent 2015-08-27 07:21:34 -03:00
Renato Botelho
e730f5d902 Remove old branches, it's not a good idea to gitsync a new system with old branch 2015-08-27 07:21:24 -03:00
jim-p
4d843977d2 Fix incorrect variable references for CARP VIPs. Fixes #5016 2015-08-26 15:49:43 -04:00
Phil Davis
48081e6cfc Redmine #4925 Fix version comparison to know 10 is bigger than 9
This rtrim of ".0" is stripping any "0" from the end of the passed-in
version strings. That makes "2.3.10" become "2.3.1" which then removes
any chance of the following nice comparison logic working.
Just removing the "0" seems fine. It keeps the supplied version data
untouched, just getting rid of any trailing dots.
Apart from fixing the bug here, this change has the side-effect that a
version change from "2.3" to "2.3.0" will now be seen as an upgrade.
What is the requirement for that?
Do you want to have extra logic that checks for "bare" zeroes on the end
and make "2.3", "2.3.0", "2.3.0.0"... all be considered the same
version?
This is a resubmit of PR #1810 after integrating with the current
master.
2015-08-26 12:50:11 +05:45
Phil Davis
28bb42144d Inform on dashboard when on a later version than the official release
For people that are running a development or RC version that is later
than the official release, this will display that on the dashboard
version check.
This is a resubmit of PR #1785 after integrating with the current
master.
2015-08-26 12:42:19 +05:45
Phil Davis
9228166f43 Ignore DHCP pools that are out of range
If the user changes the subnet of an interface then applies without
adjusting the DHCP pool range/s to be in the new subnet, then an invalid
dhcpd.conf is generated. The DHCP server complains about it and exits.
If you have only 1 LAN with DHCP then it does not make a difference -
you are not going to get DHCP whatever happens because there is no valid
pool data. But if there are multiple LAN-style interfaces with DHCP then
you can cause no DHCP-service on LAN when you are messing with settings
on OPT1/OPT2...

I did this to myself last night, and even after rebooting got no DHCP
for either my LAN or OPT1, just because the OPT1 pool settings were bad.

This change checks that the pool ranges are in the interface subnet. If
they are not, then they are excluded from dhcpd.conf and a notice os
filed. The user gets the flashing notice stuff on the webGUI to tell
them what is wrong. And any other good DHCP interfaces+pools continue to
work.
This is a resubmit of PR #1783 after integrating to the current master.
2015-08-26 12:29:27 +05:45
Phil Davis
fa6e5ba524 Protect unset() with isset() in upgrade_config
Forum: https://forum.pfsense.org/index.php?topic=96827.0
Sometimes there can be unexpected stuff in a config. To avoid errors
like "PHP Fatal error: Cannot unset string offsets in
/etc/inc/upgrade_config.inc on line 291" it seems good to use
belts-and-braces checks with any unset() of associative array elements,
just in case the thing above is an empty string (instead of an array or
non-existent thing). An unnecessary error in processing the upgrade code
can mean missing other important upgrade stuff.
These are the places I could see in upgrade_config.inc where unset() is
not already protected by isset(). A lot of them are "that could not ever
go wrong", but IMHO it is worth protecting them all just to be sure.
This is a resubmit of PR #1773 after integrating with current master.
2015-08-26 11:51:57 +05:45
Jim Thompson
8e71705835 update config to rid of nt-hash
credit to: das projekt der goatse
2015-08-25 14:54:16 -05:00
jim-p
d2ecbddc79 For captive portal, if a user reloads index.php of the portal while already logged in, show the logout page instead if it's custom.
Must be a custom logout page that does not include a redirect.
2015-08-25 14:41:42 -04:00
Renato Botelho
46bc6e545a Move main pfSense content to src/ 2015-08-25 14:49:54 -03:00