diff options
20 files changed, 34 insertions, 34 deletions
diff --git a/src/usr/local/bin/captiveportal_gather_stats.php b/src/usr/local/bin/captiveportal_gather_stats.php index 23d6b5d..87f0375 100644 --- a/src/usr/local/bin/captiveportal_gather_stats.php +++ b/src/usr/local/bin/captiveportal_gather_stats.php @@ -1,6 +1,5 @@ #!/usr/local/bin/php-cgi -q <?php -/* $Id$ */ /* captiveportal_gather_stats.php Copyright (C) 2011 Warren Baker diff --git a/src/usr/local/bin/filterparser.php b/src/usr/local/bin/filterparser.php index fa60262..25faa90 100755 --- a/src/usr/local/bin/filterparser.php +++ b/src/usr/local/bin/filterparser.php @@ -1,6 +1,5 @@ #!/usr/local/bin/php-cgi -q <?php -/* $Id$ */ /* filterparser.php part of pfSesne by Scott Ullrich diff --git a/src/usr/local/captiveportal/index.php b/src/usr/local/captiveportal/index.php index b851e91..780d24b 100644 --- a/src/usr/local/captiveportal/index.php +++ b/src/usr/local/captiveportal/index.php @@ -1,6 +1,5 @@ <?php /* - $Id$ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2013-2015 Electric Sheep Fencing, LP diff --git a/src/usr/local/captiveportal/radius_accounting.inc b/src/usr/local/captiveportal/radius_accounting.inc index 2d9c97e..1b74378 100644 --- a/src/usr/local/captiveportal/radius_accounting.inc +++ b/src/usr/local/captiveportal/radius_accounting.inc @@ -1,9 +1,6 @@ <?php /* vim: set expandtab tabstop=4 shiftwidth=4: */ /* - - $Id$ - Copyright (c) 2006, Jonathan De Graeve <jonathan.de.graeve@imelda.be> All rights reserved. diff --git a/src/usr/local/captiveportal/radius_authentication.inc b/src/usr/local/captiveportal/radius_authentication.inc index 9938e24..7a2ad90 100644 --- a/src/usr/local/captiveportal/radius_authentication.inc +++ b/src/usr/local/captiveportal/radius_authentication.inc @@ -1,8 +1,6 @@ <?php /* vim: set expandtab tabstop=4 shiftwidth=4: */ /* - $Id$ - Copyright (c) 2006, Jonathan De Graeve <jonathan.de.graeve@imelda.be> All rights reserved. diff --git a/src/usr/local/www/jquery/pfSense.js b/src/usr/local/www/jquery/pfSense.js index 77234e7..a30b4b6 100644 --- a/src/usr/local/www/jquery/pfSense.js +++ b/src/usr/local/www/jquery/pfSense.js @@ -80,7 +80,7 @@ $(function() { var group = $(this).parents('div.form-group'); var clone = group.clone(true); - clone.find('*').removeAttr('value'); + clone.find('*').removeAttr('value'); clone.appendTo(group.parent()); }); @@ -96,7 +96,7 @@ $(function() { // Automatically change IpAddress mask selectors to 128/32 options for IPv6/IPv4 addresses $('span.pfIpMask + select').each(function (idx, select){ var input = $(select).prevAll('input[type=text]'); - + input.on('change', function(e){ var isV6 = (input.val().indexOf(':') != -1), min = 0, max = 128; if (!isV6) @@ -105,10 +105,10 @@ $(function() { if (input.val() == "") return; - // Eat all of the options with a value greater than max. We don't want them to be available + // Eat all of the options with a value greater than max. We don't want them to be available while (select.options[0].value > max) select.remove(0); - + if (select.options.length < max) { for (var i=select.options.length; i<=max; i++) select.options.add(new Option(i, i), 0); @@ -118,14 +118,14 @@ $(function() { // Fire immediately input.change(); }); - + // Add confirm to all btn-danger buttons and fa-trash icons // Use element title in the confirmation message, or if not available // the element value $('.btn-danger, .fa-trash').on('click', function(e){ if(!($(this).hasClass('no-confirm'))) { var msg = $.trim(this.textContent); - + if(!msg) var msg = $.trim(this.value).toLowerCase(); @@ -142,16 +142,16 @@ $(function() { // Add toggle-all when there are multiple checkboxes and none of them are radio buttons $('.control-label + .checkbox.multi').each(function() { var a = $('<a name="btntoggleall" class="btn btn-xs btn-default">toggle all</a>'); - + if(($(this).html().indexOf("type=\"radio\"") == -1)) { a.on('click', function() { var wrap = $(this).parents('.form-group').find('.checkbox.multi'), all = wrap.find('input[type=checkbox]'), checked = wrap.find('input[type=checkbox]:checked'); - + all.prop('checked', (all.length != checked.length)); }); - + a.appendTo($(this)); } }); diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js index 9ba9135..c7bca81 100644 --- a/src/usr/local/www/jquery/pfSenseHelpers.js +++ b/src/usr/local/www/jquery/pfSenseHelpers.js @@ -378,7 +378,7 @@ if($('#infoblock').length != 0) { // Hide information on page load $('#infoblock').hide(); -// SHow the help on clicking the info icon +// Show the help on clicking the info icon $('#showinfo').click(function() { $('#infoblock').toggle(); });
\ No newline at end of file diff --git a/src/usr/local/www/widgets/javascript/thermal_sensors.js b/src/usr/local/www/widgets/javascript/thermal_sensors.js index d48f925..caad43c 100644 --- a/src/usr/local/www/widgets/javascript/thermal_sensors.js +++ b/src/usr/local/www/widgets/javascript/thermal_sensors.js @@ -1,5 +1,5 @@ /* - $Id: thermal_sensors.js + thermal_sensors.js */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index b01f3ff..953350c 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -1,6 +1,5 @@ <?php /* - $Id$ carp_status.widget.php */ /* ==================================================================== diff --git a/src/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php b/src/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php index 69dd01b..00f410c 100644 --- a/src/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php +++ b/src/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php @@ -1,6 +1,6 @@ <?php /* - $Id$ + cpu_graphs.widget.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. diff --git a/src/usr/local/www/widgets/widgets/interface_statistics.widget.php b/src/usr/local/www/widgets/widgets/interface_statistics.widget.php index 9a1f99c..866d42b 100644 --- a/src/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/src/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -1,6 +1,6 @@ <?php /* - $Id: interface_statistics.widget.php + interface_statistics.widget.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index 5333a2e..74276d5 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -1,6 +1,6 @@ <?php /* - * ipsec.widget.php + ipsec.widget.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. diff --git a/src/usr/local/www/widgets/widgets/ntp_status.widget.php b/src/usr/local/www/widgets/widgets/ntp_status.widget.php index 6f04d47..76cf4fc 100644 --- a/src/usr/local/www/widgets/widgets/ntp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/ntp_status.widget.php @@ -1,7 +1,8 @@ <?php /* ntp_status.widget.php -*//* ==================================================================== +*/ +/* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php index 1f3c44f..6384297 100644 --- a/src/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php @@ -1,5 +1,4 @@ <?php - /* openvpn.widget.php */ diff --git a/src/usr/local/www/widgets/widgets/smart_status.widget.php b/src/usr/local/www/widgets/widgets/smart_status.widget.php index 8536f2e..5c61e12 100644 --- a/src/usr/local/www/widgets/widgets/smart_status.widget.php +++ b/src/usr/local/www/widgets/widgets/smart_status.widget.php @@ -104,7 +104,7 @@ if (count($devs) > 0) { <td><?=ucfirst($dev_state)?></td> </tr> <?php - } + } } ?> </tbody> diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php index 81ddfae..1a92885 100644 --- a/src/usr/local/www/widgets/widgets/system_information.widget.php +++ b/src/usr/local/www/widgets/widgets/system_information.widget.php @@ -354,7 +354,7 @@ function updateMeters() { setTimer(); } -events.push(function(){ +events.push(function(){ setTimeout('systemStatusGetUpdateStatus()', 4000); }); @@ -371,7 +371,7 @@ function setProgress(barName, percent) { } function setTimer() { - timeout = window.setTimeout('updateMeters()', update_interval); + timeout = window.setTimeout('updateMeters()', update_interval); } function stats(x) { @@ -493,7 +493,7 @@ function updateInterfaceStats(x){ for (var y=0; y<statistics_split.length-1; y++){ if(jQuery('#stat' + counter)) { jQuery('#stat' + counter).html(statistics_split[y]); - counter++; + counter++; } } } diff --git a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php index 30b57f3..7f7f7af 100644 --- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -1,6 +1,6 @@ <?php /* - $Id: thermal_sensors.widget.php + thermal_sensors.widget.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. diff --git a/src/usr/local/www/wizards/openvpn_wizard.inc b/src/usr/local/www/wizards/openvpn_wizard.inc index ee530a2..ddd857e 100644 --- a/src/usr/local/www/wizards/openvpn_wizard.inc +++ b/src/usr/local/www/wizards/openvpn_wizard.inc @@ -1,5 +1,8 @@ <?php /* + openvpn_wizard.inc +*/ +/* Copyright (C) 2010 Ermal Luçi All rights reserved. @@ -207,7 +210,7 @@ function step7_submitphpaction() { empty($_POST['organization']) || empty($_POST['email'])) { $stepid--; $savemsg = "Please enter all information for the new Certificate Authority."; - } elseif (has_special_chars($_POST['country']) || has_special_chars($_POST['state']) || + } elseif (has_special_chars($_POST['country']) || has_special_chars($_POST['state']) || has_special_chars($_POST['city']) || has_special_chars($_POST['organization'])) { $stepid--; $input_errors[] = "Please do not use special characters in Certificate field names."; @@ -298,7 +301,7 @@ function step9_submitphpaction() { $certnames[] = $cert['descr']; $certinfo = cert_get_subject_hash($cert['crt']); $certcns[] = $certinfo["CN"]; - } + } } if (preg_match("/[\?\>\<\&\/\\\"\']/", $_POST['descr'])) { @@ -310,13 +313,13 @@ function step9_submitphpaction() { empty($_POST['organization']) || empty($_POST['email'])) { $stepid--; $savemsg = "Please enter all information for the new certificate."; - } elseif (has_special_chars($_POST['country']) || has_special_chars($_POST['state']) || + } elseif (has_special_chars($_POST['country']) || has_special_chars($_POST['state']) || has_special_chars($_POST['city']) || has_special_chars($_POST['organization'])) { $stepid--; $input_errors[] = "Please do not use special characters in Certificate field names."; } elseif (in_array($_POST['descr'], $certnames) || in_array($_POST['descr'], $certcns)) { $stepid--; - $savemsg = "Please enter a different name for the Certificate. A Certificate with that name/common name already exists."; + $savemsg = "Please enter a different name for the Certificate. A Certificate with that name/common name already exists."; } elseif (strlen($_POST['country']) != 2) { $stepid--; $savemsg = "Please enter only a two-letter ISO country code"; diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 6ed2b42..796752b 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1,4 +1,7 @@ <?php +/* + traffic_shaper_wizard_dedicated.inc +*/ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index 4cc2ba6..91b9b19 100644 --- a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1,4 +1,7 @@ <?php +/* + traffic_shaper_wizard_multi_all.inc +*/ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * |
