diff --git a/src/www/system.php b/src/www/system.php index d5a409be0..52bf7a054 100644 --- a/src/www/system.php +++ b/src/www/system.php @@ -95,7 +95,7 @@ foreach($interfaces as $interface) { if ($_POST) { $changecount++; - + unset($input_errors); $pconfig = $_POST; @@ -180,7 +180,7 @@ if ($_POST) { /* pfSense themes */ if (! $g['disablethemeselection']) { - update_if_changed("System Theme", $config['theme'], $_POST['theme']); + update_if_changed("System Theme", $config['theme'], $_POST['theme']); } /* XXX - billm: these still need updating after figuring out how to check if they actually changed */ @@ -269,7 +269,7 @@ if ($_POST) { // Reload the filter - plugins might need to be run. $retval |= filter_configure(); - + $savemsg = get_std_save_message($retval); } @@ -283,260 +283,260 @@ include("head.inc"); - +
- +
-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
-
- - -
- firewall - -
-
- - -
- - -
- - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + + +
- - +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + - - - - - + + + + +
+
+ + +
+ firewall + +
+
+ + +
+ + +
+ + + + + + + + + + + + + + + - - - -
+ + - + -
- - - -
- -
- -
- -
- /> - - - -
- -
-
- /> - - - -
- - - -
- -
- - - -
+ + + +
+ +
+ +
+ +
+ /> + + + +
+ +
+
+ /> + + + +
+ + + +
+ +
+ + + +
- -
- - - -
- - - - -
+ +
+ + + +
+ + + + +
- - - + +
+ - - - - - - - - - - - - - - - -
  - - - - . - -
  - " /> -
- +
  + + + + . + +
  + " /> +
+
- +
- +
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index f7f3d6dd4..8df764a0d 100644 --- a/src/www/system_advanced_admin.php +++ b/src/www/system_advanced_admin.php @@ -285,16 +285,16 @@ include("head.inc"); ?> - + @@ -302,339 +302,339 @@ include("head.inc");
- +
- - - -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - onclick="prot_change()" /> - -     - onclick="prot_change()" /> - - -
- - - - -
- -
- -
- - - -
- -
- - - -
- /> - -
- -
- /> - -
- -
- /> - -
- -
- - /> - -
- - -
- /> - -
- DNS Rebinding attacks. " . - "This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " . - "webConfigurator access or name resolution in your environment. "); ?> -
- -
- -
- -
- /> - -
- Wikipedia."); ?> -
- /> - -
- -
- " . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "

"; - } ?> - Wikipedia."); ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- /> - -
- /> - -
- - -
- /> - -
- - - -
- -
- -
 
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- /> - - null modem serial cable or adapter is required to use the serial console."); ?> -
- bps -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - -
- /> - -
- -
 
 " />
-
- -
+ + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + onclick="prot_change()" /> + +     + onclick="prot_change()" /> + + +
+ + + + +
+ +
+ +
+ + + +
+ +
+ + + +
+ /> + +
+ +
+ /> + +
+ +
+ /> + +
+ +
+ + /> + +
+ + +
+ /> + +
+ DNS Rebinding attacks. " . + "This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " . + "webConfigurator access or name resolution in your environment. "); ?> +
+ +
+ +
+ +
+ /> + +
+ Wikipedia."); ?> +
+ /> + +
+ +
+ " . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "

"; + } ?> + Wikipedia."); ?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ /> + +
+ + +
+ /> + +
+ + + +
+ +
+ +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> + + null modem serial cable or adapter is required to use the serial console."); ?> +
+ bps +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ +
 
 " />
+ +
+ +
- +
- +
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php index 595e60886..06eefbbda 100644 --- a/src/www/system_advanced_firewall.php +++ b/src/www/system_advanced_firewall.php @@ -236,9 +236,9 @@ include("head.inc"); ?> - + - + - +
- +
- - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- /> -
- -
- /> -
- -
- -
- - -
- -
- /> - -
-
- -
. - -
- /> - -
-
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- -
- - - - - - -
- /> - -
- -
-
Disable Auto-added VPN rules - /> - -
- - -
Disable reply-to - /> - -
- -
-
Disable Negate rules - /> - -
- -
-
- -
- -
- -
- /> - -
- -
-
- - - - - - - - - - - - - - - - - -
- -
- -
- - 1): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
- -
- -

- -

- -

- -
-
- -

- -
- /> - -

- -

- -
- /> - -
- -

- -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ /> +
+ +
+ /> +
+ +
+ +
+ + +
+ +
+ /> + +
+
+ +
. + +
+ /> + +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ + + + + + +
+ /> + +
+ +
+
Disable Auto-added VPN rules + /> + +
+ + +
Disable reply-to + /> + +
+ +
+
Disable Negate rules + /> + +
+ +
+
+ +
+ +
+ +
+ /> + +
+ +
+
+ + + + + + + + + + + + + + + + + +
+ +
+ +
+ + 1): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
+ +
+ +

+ +

+ +

+ +
+
+ +

+ +
+ /> + +

+ +

+ +
+ /> + +
+ +

+ +
+ - -
- - - - - - - - -
 " />
- - - - - - - + if ($rowIndex == 0) + echo ""; + ?> + + +
+ + + + + + + + +
 " />
+ +
+ + + +
+
- +
- +
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php index e5931f5d9..94c9f70ed 100644 --- a/src/www/system_advanced_misc.php +++ b/src/www/system_advanced_misc.php @@ -244,28 +244,28 @@ include("head.inc"); @@ -273,161 +273,161 @@ include("head.inc");
- +
- - - -
- -
- -
- + + + +
+ + + +
+ - + - - - + + + - + - - - - - - - - - - - - - - - - - -
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- " class="formfld unknown" /> -
- -
- - - + + + + + + + + + + + + + + + + + +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ + + - + - + - - - - - - - - - + + + + + + + + +
- onclick="sticky_checked(this)" /> -
- -
- " class="formfld unknown" /> -
- -
- /> -
- -
+ onclick="sticky_checked(this)" /> +
+ +
+ " class="formfld unknown" /> +
+ +
+ /> +
+ +
- + - - - + + + - - - - + + + +
- /> -
-
-  :  - -    -  :  - -

- -
+ /> +
+
+  :  + +    +  :  + +

+ +
- + - - - + + + @@ -454,248 +454,248 @@ include("head.inc");
- + - - - + + + - - - - - - + + + + + +
- -
- -

- -
+ +
+ +

+ +
- + - - - + + + - - - - - + + + + +
  - VPN > IPsec on the Advanced Settings tab."); ?> -
  + VPN > IPsec on the Advanced Settings tab."); ?> +
- + - - - + + + - - - - - - + + + + + +
- /> -
- -
+ /> +
+ +
- + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- /> -
- -
- /> -
- -
- /> -
- -
- onclick="tmpvar_checked(this)" /> -
- -
- " class="formfld unknown" /> MB -
- -
- " class="formfld unknown" /> MB -
- -
- - -
- -
-
-
- - -
- -
-
-
+ /> +
+ +
+ /> +
+ +
+ /> +
+ +
+ onclick="tmpvar_checked(this)" /> +
+ +
+ " class="formfld unknown" /> MB +
+ +
+ " class="formfld unknown" /> MB +
+ +
+ + +
+ +
+
+
+ + +
+ +
+
+
- + - - - + + + - - - - - + + + + + -
- -
- -
+ +
+ +
- + + - - - + + + - - - - - - - - - - - + + + + + + + + + + +
- /> -
- -
  - " /> -
+ /> +
+ +
  + " /> +
- -
- + +
+ - +
- +
- +
diff --git a/src/www/system_advanced_network.php b/src/www/system_advanced_network.php index e1c9070ed..d9ddb1e55 100644 --- a/src/www/system_advanced_network.php +++ b/src/www/system_advanced_network.php @@ -161,17 +161,17 @@ include("head.inc"); - + @@ -179,160 +179,160 @@ include("head.inc");
- +
- - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - + + +
+ + + +
+ +
- onclick="enable_change(false)" /> -
-
-
-
-
- onclick="enable_change(false)" /> -
-
-
-  :  - -
- /> -
-
-
+ + + + + + + + + + + + + + + + + + + -
+ onclick="enable_change(false)" /> +
+
+
+
+
+ onclick="enable_change(false)" /> +
+
+
+  :  + +
+ /> +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- /> -
- -
- /> -
- -
-   - -
- /> -
- -
-   - -
- /> -
- -
-   - -
- /> -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + */ ?> - -
+ /> +
+ +
+ /> +
+ +
+   + +
+ /> +
+ +
+   + +
+ /> +
+ +
+   + +
+ /> +
+ +
 
Flowtable support
Enable Flowtable - /> - Enable flowtable support
- Enables infrastructure for caching flows as a means of accelerating L3 and L2 lookups - as well as providing stateful load balancing when used with RADIX_MPATH.
-
 
Flowtable support
Enable Flowtable + /> + Enable flowtable support
+ Enables infrastructure for caching flows as a means of accelerating L3 and L2 lookups + as well as providing stateful load balancing when used with RADIX_MPATH.
+
- - - - - - -
 " />
- -
- -
- + + + + + + + + +
 " />
+ +
+ + +
@@ -340,11 +340,11 @@ include("head.inc"); - + - \ No newline at end of file + diff --git a/src/www/system_advanced_notifications.php b/src/www/system_advanced_notifications.php index 29ec969ac..7cf583e2f 100644 --- a/src/www/system_advanced_notifications.php +++ b/src/www/system_advanced_notifications.php @@ -42,17 +42,17 @@ require_once("notices.inc"); // Growl $pconfig['disable_growl'] = isset($config['notifications']['growl']['disable']); -if($config['notifications']['growl']['password']) +if($config['notifications']['growl']['password']) $pconfig['password'] = $config['notifications']['growl']['password']; -if($config['notifications']['growl']['ipaddress']) +if($config['notifications']['growl']['ipaddress']) $pconfig['ipaddress'] = $config['notifications']['growl']['ipaddress']; -if($config['notifications']['growl']['notification_name']) +if($config['notifications']['growl']['notification_name']) $pconfig['notification_name'] = $config['notifications']['growl']['notification_name']; else $pconfig['notification_name'] = "{$g['product_name']} growl alert"; - -if($config['notifications']['growl']['name']) + +if($config['notifications']['growl']['name']) $pconfig['name'] = $config['notifications']['growl']['name']; else $pconfig['name'] = 'PHP-Growl'; @@ -93,7 +93,7 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - system_setup_sysctl(); + system_setup_sysctl(); $savemsg = get_std_save_message($retval); } @@ -145,7 +145,7 @@ if ($_POST) { } if ($_POST['test_growl'] == gettext("Test Growl")) { // Send test message via growl - if($config['notifications']['growl']['ipaddress'] && + if($config['notifications']['growl']['ipaddress'] && $config['notifications']['growl']['password'] = $_POST['password']) { unlink_if_exists($g['vardb_path'] . "/growlnotices_lastmsg.txt"); register_via_growl(); @@ -167,204 +167,204 @@ include("head.inc"); - +
- +
- +
- -
- + + +
- - - -
- + + + +
+
- -
- - - - - - - - - - - - - - - - - + +
+ +
- checked="checked" />
- -
- ' />
- -
+ + + + + + + + + + + + + + + - - - - - - - - - - - - - - - -
+ checked="checked" />
+ +
+ ' />
+ +
- ' />
- -
- ' />
- -
- ' />
- -
-   - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- checked="checked" />
- -
- ' />
- -
- ' />
- -
- />Enable SMTP over SSL/TLS
- />Enable STARTTLS
-
- ' />
- -
- ' />
- -
- ' />
- -
- ' />
- -
-   - - -
-
 
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+   + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+ checked="checked" />
+ +
+ ' />
+ +
+ ' />
+ +
+ />Enable SMTP over SSL/TLS
+ />Enable STARTTLS
+
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+ ' />
+ +
+   + + +
+
 
- - - - - - - - - - - - - - - - - - - - - - -
- /> - -
- -
 
-   - - -
+ + + + + + + + + + + + + + + + + + + + + + + +
+ /> + +
+ +
 
+   + + +
- -
+ +
-
+
- + - diff --git a/src/www/system_advanced_sysctl.php b/src/www/system_advanced_sysctl.php index f43e844a3..52cbc1c37 100644 --- a/src/www/system_advanced_sysctl.php +++ b/src/www/system_advanced_sysctl.php @@ -99,7 +99,7 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - system_setup_sysctl(); + system_setup_sysctl(); $savemsg = get_std_save_message($retval); clear_subsystem_dirty('sysctl'); } @@ -132,140 +132,140 @@ include("head.inc"); - - + +
- +
- +
- -
- + + +
- - - -
- -
- + + + +
+ +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - ')" class="btn btn-default btn-xs"> - - -
-
- - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + ')" class="btn btn-default btn-xs"> + + +
+
+ + + +
+ - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
  - " /> - " onclick="window.location.href=''" /> - - - - -
-
- - -
- + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
  + " /> + " onclick="window.location.href=''" /> + + + + +
+
+ + +
+
-
+
- \ No newline at end of file + diff --git a/src/www/system_advanced_tabs.php b/src/www/system_advanced_tabs.php index 665f5212e..ad6ecae75 100644 --- a/src/www/system_advanced_tabs.php +++ b/src/www/system_advanced_tabs.php @@ -5,7 +5,7 @@ \ No newline at end of file +?> diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php index 111e87e77..6e2e8dfcd 100644 --- a/src/www/system_authservers.php +++ b/src/www/system_authservers.php @@ -330,7 +330,7 @@ function server_typechange(typ) { typ = document.getElementById("type").options[idx].value; } - switch (typ) { + switch (typ) { case "ldap": document.getElementById("ldap").style.display=""; document.getElementById("radius").style.display="none"; @@ -443,19 +443,19 @@ function select_clicked() {
-
+
- + - +
- - - +
- + -
+
- +
@@ -502,17 +502,17 @@ function select_clicked() {
- + - + - + - - - + + + - + @@ -614,18 +614,18 @@ function select_clicked() {  
    -
    • -
  • " />
    • +
    • +
  • " />
- + - +

CN=Users;DC=example,DC=com
OU=Staff;OU=Freelancers - + @@ -639,7 +639,7 @@ function select_clicked() { /> - +
&(objectClass=inetOrgPerson)(mail=*@example.com) @@ -745,11 +745,11 @@ function select_clicked() { - + - + @@ -818,8 +818,8 @@ function select_clicked() {
-
- +
+ @@ -829,7 +829,7 @@ function select_clicked() { - + + + + + + + + + + + + + + + + + + + + +

@@ -874,7 +874,7 @@ function select_clicked() { - + - \ No newline at end of file + diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php index 876bb444a..2ac574d8c 100644 --- a/src/www/system_camanager.php +++ b/src/www/system_camanager.php @@ -310,7 +310,7 @@ $main_buttons = array( ?> "> - + - +

- +
- + - +
- - - -
- + + + +
+ - - - - - - + + // Load valid country codes + $dn_cc = array(); + if (file_exists("/usr/local/etc/ca_countries")){ + $dn_cc_file=file("/usr/local/etc/ca_countries"); + foreach($dn_cc_file as $line) + if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) + array_push($dn_cc, $matches[1]); + } + ?> + + + + + + - - - - - - - - - - - - - - - -
- -
- -
- - - - - - - - + + +
+ + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - -
- -
- -

- -
- -
- -
-
+ +
+ +

+ +
+ +
+ +
+
- - - - - - - - - - - -
+ +
+ + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -
-
- - -
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
:   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
:   - -   - -   - -
-
- - - - - - -
  - " /> - - - -
- - - - - - - - - - - - - - - - - - " . gettext("self-signed") . ""; - else - $issuer_name = "" . gettext("external") . ""; - $subj = htmlspecialchars($subj); - $issuer = htmlspecialchars($issuer); - $certcount = 0; - - $issuer_ca = lookup_ca($ca['caref']); - if ($issuer_ca) - $issuer_name = $issuer_ca['descr']; - - // TODO : Need gray certificate icon - - if($ca['prv']) { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "YES"; - - } else { - $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $internal = "NO"; - } - foreach ($a_cert as $cert) - if ($cert['caref'] == $ca['refid']) - $certcount++; - foreach ($a_ca as $cert) - if ($cert['caref'] == $ca['refid']) - $certcount++; - ?> - - - - - - - - - - - - -
- -    
- - - - - - - - - - - -
 :
 :
- 		- " alt="" class="btn btn-default btn-xs"> - " alt="" class="btn btn-default btn-xs"> - - " class="btn btn-default btn-xs"> - - ')" title="" class="btn btn-default btn-xs"> -
- - - +
+ + +
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
:   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
:   + +   + +   + +
+
+ + + + + + +
  + " /> + + + +
+ + + + + + + + + + + + + + + + + + " . gettext("self-signed") . ""; + else + $issuer_name = "" . gettext("external") . ""; + $subj = htmlspecialchars($subj); + $issuer = htmlspecialchars($issuer); + $certcount = 0; + + $issuer_ca = lookup_ca($ca['caref']); + if ($issuer_ca) + $issuer_name = $issuer_ca['descr']; + + // TODO : Need gray certificate icon + + if($ca['prv']) { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "YES"; + + } else { + $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; + $internal = "NO"; + } + foreach ($a_cert as $cert) + if ($cert['caref'] == $ca['refid']) + $certcount++; + foreach ($a_ca as $cert) + if ($cert['caref'] == $ca['refid']) + $certcount++; + ?> + + + + + + + + + + + + +
+ +    
+ + + + + + + + + + + +
 :
 :
+ 		+ " alt="" class="btn btn-default btn-xs"> + " alt="" class="btn btn-default btn-xs"> + + " class="btn btn-default btn-xs"> + + ')" title="" class="btn btn-default btn-xs"> +
+ + +
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php index 6e79f5446..5966858e7 100644 --- a/src/www/system_certmanager.php +++ b/src/www/system_certmanager.php @@ -81,7 +81,7 @@ $a_cert =& $config['cert']; $internal_ca_count = 0; foreach ($a_ca as $ca) - if ($ca['prv']) + if ($ca['prv']) $internal_ca_count++; $act = $_GET['act']; @@ -304,7 +304,7 @@ if ($_POST) { array_push($input_errors, gettext("Please select a valid Key Length.")); if (($pconfig['method'] != "external") && !in_array($_POST["digest_alg"], $openssl_digest_algs)) array_push($input_errors, gettext("Please select a valid Digest Algorithm.")); - + if (($pconfig['method'] == "external") && isset($_POST["csr_keylen"]) && !in_array($_POST["csr_keylen"], $cert_keylens)) array_push($input_errors, gettext("Please select a valid Key Length.")); if (($pconfig['method'] == "external") && !in_array($_POST["csr_digest_alg"], $openssl_digest_algs)) @@ -428,7 +428,7 @@ if ($_POST) { // } $mod_csr = csr_get_modulus($pconfig['csr'], false); $mod_cert = cert_get_modulus($pconfig['cert'], false); - + if (strcmp($mod_csr,$mod_cert)) { // simply: if the moduli don't match, then the private key and public key won't match $input_errors[] = sprintf(gettext("The certificate modulus does not match the signing request modulus."),$subj_cert); @@ -575,16 +575,16 @@ function internalca_change() {
- +
- - - + + +
@@ -621,39 +621,39 @@ function internalca_change() { - - - - - - + + + + + + - - - - - - - - + + + + + + + +
- -
- -
- -
- -
+ +
+ +
+ +
+ +
- - - + + + - + @@ -835,157 +835,157 @@ function internalca_change() {
- - - + + + - - - - - - - - - - - - + + + + + + + + + + + +
- - bits -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
:   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
:   - -   - ex: -   - -
-
+ + bits +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
:   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
:   + +   + ex: +   + +
+
- - - + + + - - - - + + + +
- - - - -
+ + + + +
@@ -1060,20 +1060,20 @@ function internalca_change() { - - - - - - - + + + + + + + '; ?> @@ -1158,43 +1158,43 @@ function internalca_change() {
- +
- - - - - - - - - + + + + + + + + + -
- "> - - - - "> - - - - "> - - - - ')" title=""> - - - - "> - - - + "> + + + + "> + + + + "> + + + + ')" title=""> + + + + "> + + +
+
- +   diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php index a939d6ea5..14e20faf4 100644 --- a/src/www/system_crlmanager.php +++ b/src/www/system_crlmanager.php @@ -1,20 +1,20 @@ @@ -277,351 +277,351 @@ include("head.inc");
- +
- - - + + +
-
- - - - - - - - - - - - - - - -
- -
- -
- -
- - - - - - - - - - - - - - - - -
- -
- -
- - + +
+ + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + +
+ +
+ +
+ + - - - + + + - + - - - - - - - - -
- -
- -
- -
- -
- - - - - - -
  - " /> - - - -
-
+ + + +
+ + + + + + + +
+ + + + + + + + + + + +
  + " /> + + + +
+ - - -
- - - - - - - - - - - - - - - - - -
- -
- -
-
  - " /> - - -
-
+ + +
+ + + + + + + + + + + + + + + + + +
+ +
+ +
+
  + " /> + + +
+
- - -
- - - - - - - - - - - - - - + + + +
+ + + + + + + + + + + + + - - - - + if (!is_array($crl['cert']) || (count($crl['cert']) == 0)): ?> + + + + $cert): - $name = htmlspecialchars($cert['descr']); + foreach($crl['cert'] as $i => $cert): + $name = htmlspecialchars($cert['descr']); ?> - - - - - - - - - - - - + + + + + + + + + + + + - - + - - + if ($rowIndex == 0) + echo ""; ?> + + + + + " /> + + + - -
-      -  
+      +  
- - - - - - - " onclick="return confirm('')" class="btn btn-default"> - - -
-      -  
+ + + + + + + " onclick="return confirm('')" class="btn btn-default"> + + +
+      +  
- :
+ : - : - + : + - - - - " /> -  
 
-
- + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
-

- -

-
- - - - " class="btn btn-default btn-xs"> - - " class="btn btn-default btn-xs"> - -
- - "> - - - - "> - - - - "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
+

+ +

+
+ + + + " class="btn btn-default btn-xs"> + + " class="btn btn-default btn-xs"> + +
+ + "> + + + + "> + + + + "> - - - ')" class="btn btn-default"> - "> - - -
 
+ + + ')" class="btn btn-default"> + "> + + +
 
diff --git a/src/www/system_firmware.php b/src/www/system_firmware.php index 867f31bb8..cbe2812f3 100644 --- a/src/www/system_firmware.php +++ b/src/www/system_firmware.php @@ -197,124 +197,124 @@ include("head.inc");
- +
"") print_info_box($fwinfo); ?> - +
- - - + + +
- + - + " . $sig_warning . "
" . gettext("This means that the image you uploaded " . - "is not an official/supported image and may lead to unexpected behavior or security " . - "compromises. Only install images that come from sources that you trust, and make sure ". - "that the image has not been tampered with.") . "

". - gettext("Do you want to install this image anyway (on your own risk)?"); - + $sig_warning = "" . $sig_warning . "
" . gettext("This means that the image you uploaded " . + "is not an official/supported image and may lead to unexpected behavior or security " . + "compromises. Only install images that come from sources that you trust, and make sure ". + "that the image has not been tampered with.") . "

". + gettext("Do you want to install this image anyway (on your own risk)?"); + print_info_box($sig_warning); - + if(stristr($_FILES['ulfile']['name'],"nanobsd")) - echo "\n"; + echo "\n"; ?> - + " /> " /> - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + + + +
  - - - " /> -
- -
- - " /> -
  - - - -
- - -
- - " /> - - - - -
  + + + " /> +
+ +
+ + " /> +
  + + + +
+ + +
+ + " /> + + + + +
   - - + + - - -
- - + + +
+ + + "has started. The firewall will reboot automatically after " . + "storing the new firmware. The configuration will be maintained.");?> - - -
- + - +
- +
-
+
diff --git a/src/www/system_firmware_auto.php b/src/www/system_firmware_auto.php index 15cd13d00..20a64dc6e 100755 --- a/src/www/system_firmware_auto.php +++ b/src/www/system_firmware_auto.php @@ -70,60 +70,60 @@ include("head.inc");
- +
- - - -
+ + + +
- - - - -
- - - - -
- - - - - - - -
- - -
- -
-
-
- - - -
- - -
-
+ + + + +
+ + + + +
+ + + + + + + +
+ + +
+ +
+
+
+ + + +
+ + +
+
diff --git a/src/www/system_firmware_check.php b/src/www/system_firmware_check.php index 892ada9c5..5f96f56a3 100644 --- a/src/www/system_firmware_check.php +++ b/src/www/system_firmware_check.php @@ -45,7 +45,7 @@ if($_POST['action'] == 'pkg_update') { $shell = new Core\Shell(); // execute shell command and collect (only valid) info into named array $shell->exec("/usr/local/opnsense/scripts/pkg_updatecheck.sh",false,false,$shell_output); -} +} if($_POST['action'] == 'pkg_upgrade') { /* Setup Shell variables */ @@ -53,19 +53,19 @@ if($_POST['action'] == 'pkg_upgrade') { $shell = new Core\Shell(); // execute shell command and collect (only valid) info into named array $shell->exec("/usr/local/opnsense/scripts/pkg_upgrade.sh&",false,false,$shell_output); -} +} if($_POST['action'] == 'update_status' ) { if (file_exists($file_upgrade_progress)) { $content = file_get_contents($file_upgrade_progress); - echo $content; + echo $content; } exit; -} +} if (file_exists($file_pkg_status)) { - + $json = file_get_contents($file_pkg_status); $pkg_status = json_decode($json,true); } @@ -85,7 +85,7 @@ if($_REQUEST['getupdatestatus']) { echo "".gettext("Current status is unknown")."
".gettext("Click to check now").""; } exit; -} +} //$curcfg = $config['system']['firmware']; $pgtitle=array(gettext("System"), gettext("Firmware"), gettext("Auto Update")); @@ -100,107 +100,107 @@ include("head.inc");
- +
- - - -
- -
- + + + +
+ + +
- - - - - - - - - - - - - '; - echo ''; - echo ''; - echo ''; - foreach ($pkg_status["new_packages"] as $upgrade_new) { - echo ''; - echo ''; - } - echo '
Current Firmware Status
-
-
- -
Required new Installs
-
- '; - echo '
Package Name
'; - echo ''.$upgrade_new["name"].'
'; - echo '
'; - ?> -
+ } + echo ''; + ?> +
+ + + + Required new Installs + + + +
+ '; + echo ''; + echo 'Package Name'; + echo ''; + echo ''; + foreach ($pkg_status["new_packages"] as $upgrade_new) { + echo ''; + echo ''.$upgrade_new["name"].'
'; + echo ''; + echo ''; + } + echo ''; + ?> +
+ + + + + +
- - - - -
-
- +
- +
@@ -215,7 +215,7 @@ include("head.inc"); success:function(html) { getstatus(); location.reload(); // Reload Page to show update status - + } }); } @@ -235,7 +235,7 @@ include("head.inc"); } function updatestatus() { - + jQuery.ajax({ type: "POST", url: '/system_firmware_check.php', diff --git a/src/www/system_firmware_restorefullbackup.php b/src/www/system_firmware_restorefullbackup.php index cfa2aa1e4..baeafaec1 100644 --- a/src/www/system_firmware_restorefullbackup.php +++ b/src/www/system_firmware_restorefullbackup.php @@ -111,88 +111,88 @@ include("head.inc");
- +
- - - + + +

- +

" . gettext("The firewall is now rebooting."));?>
- + - +
- - - - - - - - - - - + +
+ + + + + + + + + - + "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - if($counter == 0) { - echo ""; - echo ""; - echo ""; - } + chdir("/root"); + $available_restore_files = glob("pfSense-full-backup-*"); + $counter = 0; + foreach($available_restore_files as $arf) { + $counter++; + $size = exec("gzip -l /root/$arf | grep -v compressed | awk '{ print $2 }'"); + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + if($counter == 0) { + echo ""; + echo ""; + echo ""; + } ?> - - - - + + + + - -
"; - echo " $arf"; - echo ""; - echo date ("F d Y H:i:s", filemtime($arf)); - echo ""; - echo format_bytes($size); - echo ""; - echo ""; - echo gettext("Delete"); - echo " | "; - echo ""; - echo gettext("Download"); - echo ""; - echo "
"; - echo gettext("Could not locate any previous backups."); - echo "
"; + echo " $arf"; + echo ""; + echo date ("F d Y H:i:s", filemtime($arf)); + echo ""; + echo format_bytes($size); + echo ""; + echo ""; + echo gettext("Delete"); + echo " | "; + echo ""; + echo gettext("Download"); + echo ""; + echo "
"; + echo gettext("Could not locate any previous backups."); + echo "
-  
- -
- " /> -
+  
+ +
+ " /> +
+ +
diff --git a/src/www/system_firmware_settings.php b/src/www/system_firmware_settings.php index ac604258a..8301711e6 100644 --- a/src/www/system_firmware_settings.php +++ b/src/www/system_firmware_settings.php @@ -78,13 +78,13 @@ if(file_exists("{$g['tmp_path']}/manifest")) { // @@ -96,176 +96,176 @@ function enable_altfirmwareurl(enable_over) {
- +
- - - + + +
- +
- + - - - - - - + + + + + + - + - - - - + + + + - - - + + - + - + - - - + + + - + - - - - - - - - - + + + + + + + + +
- /> -
- -
- /> -
- -
+ /> +
+ +
+ /> +
+ +
- - + + - + - - - + + + - - - - - - - + + + + + + + - - - + + - + + - - - + + - - - +
+ + + + + - - + +
  @@ -273,10 +273,10 @@ function enable_altfirmwareurl(enable_over) {
- +
- -
+ +
@@ -290,4 +290,4 @@ enable_altfirmwareurl(); //]]> - \ No newline at end of file + diff --git a/src/www/system_firmware_tabs.php b/src/www/system_firmware_tabs.php index 9c8d71a8c..65bfa79c1 100644 --- a/src/www/system_firmware_tabs.php +++ b/src/www/system_firmware_tabs.php @@ -34,4 +34,4 @@ //if($g['hidedownloadbackup'] == false) // $tab_array[] = array(gettext("Restore Full Backup"), $active_tab == "/system_firmware_restorefullbackup.php", "system_firmware_restorefullbackup.php"); display_top_tabs($tab_array); -?> \ No newline at end of file +?> diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php index b8f6976b9..bc5d47328 100644 --- a/src/www/system_gateway_groups.php +++ b/src/www/system_gateway_groups.php @@ -111,17 +111,17 @@ $main_buttons = array(
-
+
- +
"));?>

- +
- - + + - -
- -
+ +
+ +
- +
@@ -146,8 +146,8 @@ $main_buttons = array( + + @@ -197,13 +197,13 @@ $main_buttons = array(

- + - - - \ No newline at end of file + + + diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php index 621e117a7..c375eb775 100644 --- a/src/www/system_gateway_groups_edit.php +++ b/src/www/system_gateway_groups_edit.php @@ -1,22 +1,22 @@ -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -83,9 +83,9 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "name"); $reqdfieldsn = explode(",", "Name"); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - + if (! isset($_POST['name'])) { $input_errors[] = gettext("A valid gateway group name must be specified."); } @@ -138,12 +138,12 @@ if ($_POST) { $a_gateway_groups[$id] = $gateway_group; else $a_gateway_groups[] = $gateway_group; - + mark_subsystem_dirty('staticroutes'); mark_subsystem_dirty('gwgroup.' . $gateway_group['name']); - + write_config(); - + header("Location: system_gateway_groups.php"); exit; } @@ -229,10 +229,10 @@ jQuery(function ($) {
- -
- + - @@ -306,7 +306,7 @@ jQuery(function ($) { echo ""; echo ""; - } + } ?>
+
{$gateway['descr']} "; echo "

@@ -336,13 +336,13 @@ jQuery(function ($) { - +
  - + " /> " onclick="window.location.href=''" /> diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php index a2691b3bf..569ea5e42 100644 --- a/src/www/system_gateways.php +++ b/src/www/system_gateways.php @@ -191,201 +191,201 @@ $main_buttons = array( - - + + - +
- +
- + " . gettext("You must apply the changes in order for them to take effect.")); + if ($input_errors) print_input_errors($input_errors); + if ($savemsg) print_info_box($savemsg); + if (is_subsystem_dirty('staticroutes')) print_info_box_np(gettext("The gateway configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); ?> - +
- + - -
- + +
+
- -
+ + - - - - - - - - - - - - + + + + + + + + + + + + "; $i = 0; foreach ($a_gateways as $gateway): - if (isset($gateway['disabled']) || isset($gateway['inactive'])) { - $textss = ""; - $iconfn = "glyphicon glyphicon-play text-muted"; - } else { - $textss = ""; - $iconfn = "glyphicon glyphicon-play text-success"; - } + if (isset($gateway['disabled']) || isset($gateway['inactive'])) { + $textss = ""; + $iconfn = "glyphicon glyphicon-play text-muted"; + } else { + $textss = ""; + $iconfn = "glyphicon glyphicon-play text-success"; + } ?> - - + - + - + - + - + - + + - - + - + + + + + - - - + + +
  - -
  + +
- +
+ - + -   +   - + - "> - + "> + - " > - - - + " > + + + - "> + "> - + (default)"; - echo $textse; + echo $textss; + echo $gateway['name']; + if(isset($gateway['defaultgw'])) + echo " (default)"; + echo $textse; ?> - + - + - + - + - + - - - - - - + + + + + + - - ')" class="btn btn-default btn-xs"> - - - + + ')" class="btn btn-default btn-xs"> + + + - - - -
- - - + + - - - + endif; + ?> + + +
+
+ + + - -
0): - + if ($i > 0): + ?> - + -
-
+
- +
-
+
- \ No newline at end of file + diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php index a0d75d1e8..606ae7c55 100644 --- a/src/www/system_gateways_edit.php +++ b/src/www/system_gateways_edit.php @@ -556,7 +556,7 @@ function calculated_change(calculated_obj, samples_obj) { switch (samples_obj.name) { case 'avg_delay_samples': - // How many replies should be used to compute average delay + // How many replies should be used to compute average delay // for controlling "delay" alarms. // Calculate a reasonable value based on gateway probe interval and RRD 1 minute average graph step size (60). if (calculated_obj.checked && (document.iform.interval.value > 0)) @@ -630,32 +630,32 @@ function enable_change() {
-
+
- +
- +
- -
- -
-

-
- -
- -
- + +
+

+
+ +
+ + + \n"; } echo "\n"; - ?> - + ?> +
@@ -827,7 +827,7 @@ function enable_change() {
+ value="" onchange="samples_change(document.iform.avg_delay_samples_calculated, this)" /> onclick="calculated_change(this, document.iform.avg_delay_samples)" />


@@ -882,9 +882,9 @@ function enable_change() {
- -
-
+ +
+
@@ -896,4 +896,4 @@ monitor_change(); calculate_state_change(); //]]> - \ No newline at end of file + diff --git a/src/www/system_general.php b/src/www/system_general.php index 2d9c2c6f9..b73292a22 100644 --- a/src/www/system_general.php +++ b/src/www/system_general.php @@ -1,2 +1,2 @@ -
+
- + - +
- - - - -
+ +
- +
- +
" class="btn btn-default btn-xs"> - + - +
@@ -450,9 +450,9 @@ function presubmit() { - +
- +
@@ -525,7 +525,7 @@ function presubmit() { -
- - - - - - - - - - - - - - - - - - - + +
State Synchronization Settings (pfsync)
Synchronize States - /> -
- pfsync transfers state insertion, update, and deletion messages between firewalls. Each firewall sends these messages out via multicast on a specified interface, using the PFSYNC protocol (IP Protocol 240). It also listens on that interface for similar messages from other firewalls, and imports them into the local state table.

This setting should be enabled on all members of a failover group.

NOTE: Clicking save will force a configuration sync if it is enabled! (see Configuration Synchronization Settings below)

-
Synchronize Interface - -
- If Synchronize States is enabled, it will utilize this interface for communication.
- NOTE: We recommend setting this to a interface other than LAN! A dedicated interface works the best.
- NOTE: You must define a IP on each machine participating in this failover group.
- NOTE: You must have an IP assigned to the interface on any participating sync nodes. -
pfsync Synchronize Peer IP - ' /> -
- Setting this option will force pfsync to synchronize its state table to this IP address. The default is directed multicast. -
+ + + + + + + + + + + + + + + + + + + - - - -
State Synchronization Settings (pfsync)
Synchronize States + /> +
+ pfsync transfers state insertion, update, and deletion messages between firewalls. Each firewall sends these messages out via multicast on a specified interface, using the PFSYNC protocol (IP Protocol 240). It also listens on that interface for similar messages from other firewalls, and imports them into the local state table.

This setting should be enabled on all members of a failover group.

NOTE: Clicking save will force a configuration sync if it is enabled! (see Configuration Synchronization Settings below)

+
Synchronize Interface + +
+ If Synchronize States is enabled, it will utilize this interface for communication.
+ NOTE: We recommend setting this to a interface other than LAN! A dedicated interface works the best.
+ NOTE: You must define a IP on each machine participating in this failover group.
+ NOTE: You must have an IP assigned to the interface on any participating sync nodes. +
pfsync Synchronize Peer IP + ' /> +
+ Setting this option will force pfsync to synchronize its state table to this IP address. The default is directed multicast. +
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
Configuration Synchronization Settings (XMLRPC Sync)
Synchronize Config to IP - ' /> -
- Enter the IP address of the firewall to which the selected configuration sections should be synchronized.
-
- NOTE: XMLRPC sync is currently only supported over connections using the same protocol and port as this system - make sure the remote system's port and protocol are set accordingly!
-
- NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! -
Remote System Username - ' /> -
- Enter the webConfigurator username of the system entered above for synchronizing your configuration.
-
- NOTE: Do not use the Synchronize Config to IP and username option on backup cluster members! -
Remote System Password - ' /> -
- Enter the webConfigurator password of the system entered above for synchronizing your configuration.
-
- NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! -
Synchronize Users and Groups - /> -
- When this option is enabled, this system will automatically sync the users and groups over to the other HA host when changes are made. -
Synchronize Auth Servers - /> -
- When this option is enabled, this system will automatically sync the authentication servers (e.g. LDAP, RADIUS) over to the other HA host when changes are made. -
Synchronize Certificates - /> -
- When this option is enabled, this system will automatically sync the Certificate Authorities, Certificates, and Certificate Revocation Lists over to the other HA host when changes are made. -
Synchronize rules - /> -
- When this option is enabled, this system will automatically sync the firewall rules to the other HA host when changes are made. -
Synchronize Firewall Schedules - /> -
- When this option is enabled, this system will automatically sync the firewall schedules to the other HA host when changes are made. -
Synchronize aliases - /> -
- When this option is enabled, this system will automatically sync the aliases over to the other HA host when changes are made. -
Synchronize NAT - /> -
- When this option is enabled, this system will automatically sync the NAT rules over to the other HA host when changes are made. -
Synchronize IPsec - /> -
- When this option is enabled, this system will automatically sync the IPsec configuration to the other HA host when changes are made. -
Synchronize OpenVPN - /> -
- When this option is enabled, this system will automatically sync the OpenVPN configuration to the other HA host when changes are made. Using this option implies "Synchronize Certificates" as they are required for OpenVPN. -
Synchronize DHCPD - /> -
- When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made. This only applies to DHCP for IPv4. -
Synchronize Wake on LAN - /> -
- When this option is enabled, this system will automatically sync the WoL configuration to the other HA host when changes are made. -
Synchronize Static Routes - /> -
- When this option is enabled, this system will automatically sync the Static Route configuration to the other HA host when changes are made. -
Synchronize Load Balancer - /> -
- When this option is enabled, this system will automatically sync the Load Balancer configuration to the other HA host when changes are made. -
Synchronize Virtual IPs - /> -
- When this option is enabled, this system will automatically sync the CARP Virtual IPs to the other HA host when changes are made. -
Synchronize traffic shaper(queues) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for queues to the other HA host when changes are made. -
Synchronize traffic shaper(limiter) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for limiters to the other HA host when changes are made. -
Synchronize traffic shaper(layer7) - /> -
- When this option is enabled, this system will automatically sync the traffic shaper configuration for layer7 to the other HA host when changes are made. -
Synchronize DNS Forwarder - /> -
- When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made. -
Synchronize Captive Portal - /> -
- When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made. -
 
  - - - " onclick="window.location.href=''" /> -
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Configuration Synchronization Settings (XMLRPC Sync)
Synchronize Config to IP + ' /> +
+ Enter the IP address of the firewall to which the selected configuration sections should be synchronized.
+
+ NOTE: XMLRPC sync is currently only supported over connections using the same protocol and port as this system - make sure the remote system's port and protocol are set accordingly!
+
+ NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! +
Remote System Username + ' /> +
+ Enter the webConfigurator username of the system entered above for synchronizing your configuration.
+
+ NOTE: Do not use the Synchronize Config to IP and username option on backup cluster members! +
Remote System Password + ' /> +
+ Enter the webConfigurator password of the system entered above for synchronizing your configuration.
+
+ NOTE: Do not use the Synchronize Config to IP and password option on backup cluster members! +
Synchronize Users and Groups + /> +
+ When this option is enabled, this system will automatically sync the users and groups over to the other HA host when changes are made. +
Synchronize Auth Servers + /> +
+ When this option is enabled, this system will automatically sync the authentication servers (e.g. LDAP, RADIUS) over to the other HA host when changes are made. +
Synchronize Certificates + /> +
+ When this option is enabled, this system will automatically sync the Certificate Authorities, Certificates, and Certificate Revocation Lists over to the other HA host when changes are made. +
Synchronize rules + /> +
+ When this option is enabled, this system will automatically sync the firewall rules to the other HA host when changes are made. +
Synchronize Firewall Schedules + /> +
+ When this option is enabled, this system will automatically sync the firewall schedules to the other HA host when changes are made. +
Synchronize aliases + /> +
+ When this option is enabled, this system will automatically sync the aliases over to the other HA host when changes are made. +
Synchronize NAT + /> +
+ When this option is enabled, this system will automatically sync the NAT rules over to the other HA host when changes are made. +
Synchronize IPsec + /> +
+ When this option is enabled, this system will automatically sync the IPsec configuration to the other HA host when changes are made. +
Synchronize OpenVPN + /> +
+ When this option is enabled, this system will automatically sync the OpenVPN configuration to the other HA host when changes are made. Using this option implies "Synchronize Certificates" as they are required for OpenVPN. +
Synchronize DHCPD + /> +
+ When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made. This only applies to DHCP for IPv4. +
Synchronize Wake on LAN + /> +
+ When this option is enabled, this system will automatically sync the WoL configuration to the other HA host when changes are made. +
Synchronize Static Routes + /> +
+ When this option is enabled, this system will automatically sync the Static Route configuration to the other HA host when changes are made. +
Synchronize Load Balancer + /> +
+ When this option is enabled, this system will automatically sync the Load Balancer configuration to the other HA host when changes are made. +
Synchronize Virtual IPs + /> +
+ When this option is enabled, this system will automatically sync the CARP Virtual IPs to the other HA host when changes are made. +
Synchronize traffic shaper(queues) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for queues to the other HA host when changes are made. +
Synchronize traffic shaper(limiter) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for limiters to the other HA host when changes are made. +
Synchronize traffic shaper(layer7) + /> +
+ When this option is enabled, this system will automatically sync the traffic shaper configuration for layer7 to the other HA host when changes are made. +
Synchronize DNS Forwarder + /> +
+ When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other HA host when changes are made. +
Synchronize Captive Portal + /> +
+ When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made. +
 
  + + + " onclick="window.location.href=''" /> +
- +
- +
- +
- +
-
- - +
+ + diff --git a/src/www/system_manager_tabs.php b/src/www/system_manager_tabs.php index 34f719e7b..49966532b 100644 --- a/src/www/system_manager_tabs.php +++ b/src/www/system_manager_tabs.php @@ -6,4 +6,4 @@ $tab_array[] = array(gettext("Certificates"), $active_tab == "/system_certmanager.php", "system_certmanager.php"); $tab_array[] = array(gettext("Certificate Revocation"), $active_tab == "/system_crlmanager.php", "system_crlmanager.php"); display_top_tabs($tab_array); -?> \ No newline at end of file +?> diff --git a/src/www/system_pkg_mgr_installed.php b/src/www/system_pkg_mgr_installed.php index 84f376465..531b33ee4 100644 --- a/src/www/system_pkg_mgr_installed.php +++ b/src/www/system_pkg_mgr_installed.php @@ -1,3 +1,3 @@ \ No newline at end of file +?> diff --git a/src/www/system_routes.php b/src/www/system_routes.php index 923395031..2365e54d1 100644 --- a/src/www/system_routes.php +++ b/src/www/system_routes.php @@ -212,17 +212,17 @@ $main_buttons = array(
-
+
- +

"));?>

- +
- - + + - -
- -
+ +
+ +
- - + +
- + @@ -249,7 +249,7 @@ $main_buttons = array( @@ -355,7 +355,7 @@ $main_buttons = array( - + @@ -372,14 +372,14 @@ $main_buttons = array(
    - +

- +
-
+
- - \ No newline at end of file + + diff --git a/src/www/system_routes_edit.php b/src/www/system_routes_edit.php index 68219966e..6fda677b3 100644 --- a/src/www/system_routes_edit.php +++ b/src/www/system_routes_edit.php @@ -217,24 +217,24 @@ include("head.inc"); - +
- -
+ +
- +
- -
- -
- -
- + +
+ + + +
+
@@ -350,14 +350,14 @@ include("head.inc");
-
+
-
+
- + - \ No newline at end of file + diff --git a/src/www/system_tabs.php b/src/www/system_tabs.php index 21b1ee841..d749b4edf 100644 --- a/src/www/system_tabs.php +++ b/src/www/system_tabs.php @@ -5,4 +5,4 @@ $tab_array[] = array(gettext("Certificates"), $active_tab == "/system_certmanager.php", "system_certmanager.php"); $tab_array[] = array(gettext("Certificate Revocation"), $active_tab == "/system_crlmanager.php" ,"system_crlmanager.php"); display_top_tabs($tab_array); -?> \ No newline at end of file +?> diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php index 1fbc5e8b7..620168923 100644 --- a/src/www/system_usermanager.php +++ b/src/www/system_usermanager.php @@ -448,20 +448,20 @@ function sshkeyClicked(obj) {
-
+
- + - +
- - - - -
- - + + - +
- +
- + - - - + + + - - - + + + - + 0): @@ -759,14 +759,14 @@ function sshkeyClicked(obj) { $i++; } ?> - + - + 0): ?> @@ -896,7 +896,7 @@ function sshkeyClicked(obj) { @@ -952,15 +952,15 @@ function sshkeyClicked(obj) {  
  
- + - +
- - - -