From f4f9e428885c94a547296bcf7522b3c2eecdbd62 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 24 Mar 2015 17:47:09 +0100 Subject: [PATCH] src: clean up style and spurious comments --- src/bin/ping_hosts.sh | 4 +--- src/captiveportal/index.php | 11 ++--------- src/captiveportal/radius_accounting.inc | 14 +++----------- src/captiveportal/radius_authentication.inc | 12 +++--------- src/etc/inc/IPv6.inc | 6 ------ src/etc/inc/captiveportal.inc | 16 ++++------------ src/etc/inc/easyrule.inc | 8 ++------ src/etc/inc/growl.class | 7 +------ src/etc/inc/led.inc | 10 ++-------- 9 files changed, 18 insertions(+), 70 deletions(-) diff --git a/src/bin/ping_hosts.sh b/src/bin/ping_hosts.sh index 3ac9d6c72..5b19d8b82 100755 --- a/src/bin/ping_hosts.sh +++ b/src/bin/ping_hosts.sh @@ -1,8 +1,6 @@ #!/bin/sh -# pfSense ping helper -# written by Scott Ullrich -# (C)2006 Scott Ullrich +# Copyright (c) 2006 Scott Ullrich # All rights reserved. # Format of file should be deliminted by | diff --git a/src/captiveportal/index.php b/src/captiveportal/index.php index 53830ac1b..fd967e91f 100644 --- a/src/captiveportal/index.php +++ b/src/captiveportal/index.php @@ -1,9 +1,7 @@ . All rights reserved. @@ -28,9 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: captiveportal -*/ require_once("auth.inc"); require_once("functions.inc"); @@ -241,5 +236,3 @@ EOD; } ob_flush(); - -?> diff --git a/src/captiveportal/radius_accounting.inc b/src/captiveportal/radius_accounting.inc index c1c7c0068..d311aaf98 100644 --- a/src/captiveportal/radius_accounting.inc +++ b/src/captiveportal/radius_accounting.inc @@ -1,9 +1,6 @@ All rights reserved. @@ -33,13 +30,8 @@ This code cannot simply be copied and put under the GNU Public License or any other GPL-like (LGPL, GPL2) License. - This code is made possible thx to samples made by Michael Bretterklieber - author of the PHP PECL Radius package - -*/ - -/* - pfSense_MODULE: captiveportal + This code is made possible thx to samples made by Michael Bretterklieber + author of the PHP PECL Radius package */ define('GIGAWORDS_RIGHT_OPERAND', '4294967296'); // 2^32 diff --git a/src/captiveportal/radius_authentication.inc b/src/captiveportal/radius_authentication.inc index 4e604aea7..cce6f0826 100644 --- a/src/captiveportal/radius_authentication.inc +++ b/src/captiveportal/radius_authentication.inc @@ -1,8 +1,6 @@ All rights reserved. @@ -32,15 +30,11 @@ This code cannot simply be copied and put under the GNU Public License or any other GPL-like (LGPL, GPL2) License. - This code is made possible thx to samples made by Michael Bretterklieber - author of the PHP PECL Radius package + This code is made possible thx to samples made by Michael Bretterklieber + author of the PHP PECL Radius package */ -/* - pfSense_MODULE: captiveportal -*/ - /* RADIUS AUTHENTICATION --------------------- diff --git a/src/etc/inc/IPv6.inc b/src/etc/inc/IPv6.inc index 26d4f75fa..8e8c0de25 100644 --- a/src/etc/inc/IPv6.inc +++ b/src/etc/inc/IPv6.inc @@ -1,11 +1,5 @@ - Copyright (C) 2009-2012 Ermal Lu�i - Copyright (C) 2003-2006 Manuel Kasper . - originally part of m0n0wall (http://m0n0.ch/wall) +/* + Copyright (C) 2004-2011 Scott Ullrich + Copyright (C) 2009-2012 Ermal Luçi + Copyright (C) 2003-2006 Manuel Kasper . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -35,11 +32,6 @@ via returned RADIUS attributes. This page has been modified to delete any added rules which may have been created by other per-user code (index.php, etc). These changes are (c) 2004 Keycom PLC. - - pfSense_BUILDER_BINARIES: /sbin/ipfw /sbin/route - pfSense_BUILDER_BINARIES: /usr/local/sbin/lighttpd /usr/local/bin/minicron /sbin/pfctl - pfSense_BUILDER_BINARIES: /bin/hostname /bin/cp - pfSense_MODULE: captiveportal */ /* include all configuration functions */ diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index ed1adabf4..3a022e350 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -1,7 +1,6 @@ diff --git a/src/etc/inc/led.inc b/src/etc/inc/led.inc index 341f6e87d..1beecf170 100644 --- a/src/etc/inc/led.inc +++ b/src/etc/inc/led.inc @@ -1,16 +1,10 @@ - * * LED control library that wraps around the functionality of led(4) - * */ -/* - pfSense_BUILDER_BINARIES: /bin/echo - pfSense_MODULE: utils -*/ $led_root = "/dev/led/led";