diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-08-27 11:47:24 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-08-27 11:47:51 -0400 |
commit | b8f22f61dd6f475a2c7831e9849ff85bd5eb2736 (patch) | |
tree | 0a8b081a3d19d960fcb4ee8ee3aadf7ecb64af06 /src/usr/local | |
parent | 7295f5d0ce173b756e81d08b0a56df1775cc0897 (diff) | |
download | pfsense-b8f22f61dd6f475a2c7831e9849ff85bd5eb2736.zip pfsense-b8f22f61dd6f475a2c7831e9849ff85bd5eb2736.tar.gz |
arrray type changed to associative for country codes
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/system_advanced_firewall.php | 15 | ||||
-rw-r--r-- | src/usr/local/www/system_camanager.php | 22 | ||||
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 10 |
3 files changed, 32 insertions, 15 deletions
diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index 3b41965..2202b7e 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -718,18 +718,23 @@ print $form; events.push(function(){ // Change help text based on the selector value function setHelpText(id, text) { - $('#' + id).parent().parent('div').find('span').text(text); + $('#' + id).parent().parent('div').find('span').html(text); } function setOptText(val) { + var htext = '<font color="green">'; + if(val == 'normal') - setHelpText('firewall-optimization-options', 'The default optimization algorithm'); + htext += 'The default optimization algorithm'; else if (val == 'high-latency') - setHelpText('firewall-optimization-options', 'Used for eg. satellite links. Expires idle connections later than default'); + htext += 'Used for eg. satellite links. Expires idle connections later than default'; else if (val == 'aggressive') - setHelpText('firewall-optimization-options', 'Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections'); + htext += 'Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections'; else if (val == 'conservative') - setHelpText('firewall-optimization-options', 'Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization'); + htext += 'Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization'; + + htext += '</font>'; + setHelpText('firewall-optimization-options', htext); } // On click . . diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 605de54..7d32a0b 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -332,16 +332,19 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); + if ($savemsg) - print_info_box($savemsg); + print_info_box($savemsg, 'success'); // Load valid country codes $dn_cc = array(); if (file_exists("/etc/ca_countries")){ $dn_cc_file=file("/etc/ca_countries"); - foreach($dn_cc_file as $line) - if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) - array_push($dn_cc, $matches[1]); + foreach($dn_cc_file as $line) { + if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) { + $dn_cc[$matches[1]] = $matches[1]; + } + } } $tab_array = array(); @@ -404,7 +407,7 @@ foreach ($a_ca as $i => $ca): <?=$subj?> <br /> <small> - <?=gettext("Valid From")?>: <b><?=$startdate ?></b>, <?=gettext("Valid Until")?>: <b><?=$enddate ?></b> + <?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b> </small> </td> <td> @@ -520,7 +523,7 @@ foreach ($a_ca as $ca) } $group = new Form_Group('Signing Certificate Authority'); -$group->addClass('toggle-intermediate'); +$group->addClass('toggle-intermediate', 'collapse'); $group->add(new Form_Select( 'caref', null, @@ -602,4 +605,11 @@ $form->add($section); print $form; +$internal_ca_count = 0; +foreach ($a_ca as $ca) { + if ($ca['prv']) { + $internal_ca_count++; + } +} + include('foot.inc');
\ No newline at end of file diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 43150c2..f9f2702 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -519,9 +519,11 @@ display_top_tabs($tab_array); $dn_cc = array(); if (file_exists("/etc/ca_countries")){ $dn_cc_file=file("/etc/ca_countries"); - foreach($dn_cc_file as $line) - if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) - array_push($dn_cc, $matches[1]); + foreach($dn_cc_file as $line) { + if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) { + $dn_cc[$matches[1]] = $matches[1]; + } + } } if (!($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors))) @@ -581,7 +583,7 @@ foreach($a_cert as $i => $cert): <?=$subj?> <br /> <small> - <?=gettext("Valid From")?>: <b><?=$startdate ?></b>, <?=gettext("Valid Until")?>: <b><?=$enddate ?></b> + <?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b> </small> </td> <td> |