diff options
author | Phil Davis <phil.davis@inf.org> | 2015-11-10 17:59:02 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-11-10 17:59:02 +0545 |
commit | b37b4034e1532114d8ae3be41e6c1746522fcfea (patch) | |
tree | df196647eb0558df88c8319ecf76fde2ffdd202e | |
parent | 932711c7ec2a6cdd19a4a71b9812b1811dae348e (diff) | |
download | pfsense-b37b4034e1532114d8ae3be41e6c1746522fcfea.zip pfsense-b37b4034e1532114d8ae3be41e6c1746522fcfea.tar.gz |
etc inc delete $Id comments
and bits of white space.
Note: There are plenty of files still with old-format copyright sections
in here.
-rw-r--r-- | src/etc/inc/auth.inc | 5 | ||||
-rw-r--r-- | src/etc/inc/certs.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/crypt.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/dyndns.class | 8 | ||||
-rw-r--r-- | src/etc/inc/filter.inc | 3 | ||||
-rw-r--r-- | src/etc/inc/filter_log.inc | 3 | ||||
-rw-r--r-- | src/etc/inc/functions.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/globals.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/openvpn.auth-user.php | 1 | ||||
-rw-r--r-- | src/etc/inc/openvpn.tls-verify.php | 1 | ||||
-rw-r--r-- | src/etc/inc/priv.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/rrd.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/shaper.inc | 36 | ||||
-rw-r--r-- | src/etc/inc/system.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/upgrade_config.inc | 4 | ||||
-rw-r--r-- | src/etc/inc/vpn.inc | 3 | ||||
-rw-r--r-- | src/etc/inc/vslb.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/xmlparse.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/xmlparse_attr.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/xmlreader.inc | 1 | ||||
-rw-r--r-- | src/etc/inc/xmlrpc.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/xmlrpc_server.inc | 6 |
22 files changed, 37 insertions, 47 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index cc47b94..92b9705 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -1,9 +1,12 @@ <?php +/* + auth.inc +*/ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com> * Copyright (c) 2006 Paul Taylor <paultaylor@winn-dixie.com> - * Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net> + * Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net> * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 2919cb8..9c36228 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* certs.inc Copyright (C) 2008 Shrew Soft Inc diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc index 8d96b26..2710dd3 100644 --- a/src/etc/inc/crypt.inc +++ b/src/etc/inc/crypt.inc @@ -1,6 +1,6 @@ <?php -/* $Id$ */ +/* crypt.inc */ /* Copyright (C) 2008 Shrew Soft Inc All rights reserved. diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 104d4a6..58f6dd0 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -282,7 +282,7 @@ if ($this->_dnsVerboseLog) { log_error("DynDNS ({$this->_dnsHost}): DynDns _update() starting."); } - + if (strstr($this->_dnsRequestIf, "_vip")) { $parentif = link_carp_interface_to_parent($this->_dnsRequestIf); $realparentif = convert_friendly_interface_to_real_interface_name($parentif); @@ -697,12 +697,12 @@ // Get zone ID $getZoneId = "https://{$dnsServer}/client/v4/zones/?name={$bottom_host_name}"; - curl_setopt($ch, CURLOPT_URL, $getZoneId); + curl_setopt($ch, CURLOPT_URL, $getZoneId); $output = json_decode(curl_exec($ch)); $zone = $output->result[0]->id; if ($zone){ // If zone ID was found get host ID $getHostId = "https://{$dnsServer}/client/v4/zones/{$zone}/dns_records?name={$this->_dnsHost}"; - curl_setopt($ch, CURLOPT_URL, $getHostId); + curl_setopt($ch, CURLOPT_URL, $getHostId); $output = json_decode(curl_exec($ch)); $host = $output->result[0]->id; if ($host){ // If host ID was found update host @@ -715,7 +715,7 @@ ); $data_json = json_encode($hostData); $updateHostId = "https://{$dnsServer}/client/v4/zones/{$zone}/dns_records/{$host}"; - curl_setopt($ch, CURLOPT_URL, $updateHostId); + curl_setopt($ch, CURLOPT_URL, $updateHostId); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); curl_setopt($ch, CURLOPT_POSTFIELDS,$data_json); } diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 71471c1..d1ce9b5 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* filter.inc Copyright (C) 2004-2006 Scott Ullrich @@ -2675,7 +2674,7 @@ function filter_generate_user_rule($rule) { $rg = get_interface_gateway($rule['interface']); if (is_ipaddrv4($rg)) { $aline['reply'] = "reply-to ( {$ifcfg['if']} {$rg} ) "; - } + } } } /* if user has selected a custom gateway, lets work with it */ diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 9b35cd4..7151891 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -1,4 +1,7 @@ <?php +/* + filter_log.inc +*/ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc index 40e2dae..b95dec4 100644 --- a/src/etc/inc/functions.inc +++ b/src/etc/inc/functions.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* functions.inc Copyright (C) 2004-2006 Scott Ullrich diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 7c77f30..a09d7a3 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* globals.inc part of pfSense (https://www.pfsense.org) diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php index 0f6864b..bd75502 100644 --- a/src/etc/inc/openvpn.auth-user.php +++ b/src/etc/inc/openvpn.auth-user.php @@ -1,6 +1,5 @@ #!/usr/local/bin/php-cgi -f <?php -/* $Id$ */ /* openvpn.auth-user.php diff --git a/src/etc/inc/openvpn.tls-verify.php b/src/etc/inc/openvpn.tls-verify.php index 9e21342..c23eb5d 100644 --- a/src/etc/inc/openvpn.tls-verify.php +++ b/src/etc/inc/openvpn.tls-verify.php @@ -1,6 +1,5 @@ #!/usr/local/bin/php-cgi -f <?php -/* $Id$ */ /* openvpn.tls-verify.php diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index 851643b..0d51085 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* priv.inc Copyright (C) 2008 Shrew Soft Inc diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc index 8d4f194..d1ec4aa 100644 --- a/src/etc/inc/rrd.inc +++ b/src/etc/inc/rrd.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* rrd.inc Copyright (C) 2010 Seth Mos <seth.mos@dds.nl> diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc index f0d5932..f4fab87 100644 --- a/src/etc/inc/shaper.inc +++ b/src/etc/inc/shaper.inc @@ -3,13 +3,13 @@ shaper.inc */ /* ==================================================================== - * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * * Some or all of this file is based on the m0n0wall project which is * Copyright (c) 2004 Manuel Kasper (BSD 2 clause) * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: + * 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. @@ -17,12 +17,12 @@ * 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. + * distribution. * - * 3. All advertising materials mentioning features or use of this software + * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgment: * "This product includes software developed by the pfSense Project - * for use in the pfSense software distribution. (http://www.pfsense.org/). + * for use in the pfSense software distribution. (http://www.pfsense.org/). * * 4. The names "pfSense" and "pfSense Project" must not be used to * endorse or promote products derived from this software without @@ -2229,7 +2229,7 @@ EOJS; 'text', $this->GetU_d() ))->setHelp('d'); - + $group->add(new Form_Input( 'upperlimit3', null, @@ -2262,7 +2262,7 @@ EOJS; 'text', $this->GetR_d() ))->setHelp('d'); - + $group->add(new Form_Input( 'realtime3', null, @@ -2294,7 +2294,7 @@ EOJS; 'text', $this->GetL_d() ))->setHelp('d'); - + $group->add(new Form_Input( 'linkshare3', null, @@ -3739,7 +3739,7 @@ EOD; // If there are no bandwidths defined, make a blank one for convenience if(empty($bandwidth)) $bandwidth = array(0 => array('bw' => '', 'bwscale' => 'Kb', 'bwsched' => 'none')); - + if (is_array($bandwidth)) { foreach ($bandwidth as $bwidx => $bw) { $form .= '<tr>'; @@ -3750,31 +3750,31 @@ EOD; $form .= "</td>"; $form .= '<td class="col-xs-4">'; $form .= "<select id=\"bwtype{$bwidx}\" name=\"bwtype{$bwidx}\" class=\"form-control\">"; - + foreach (array("Kb" => "Kbit/s", "Mb" => "Mbit/s", "Gb" => "Gbit/s", "b" => "Bit/s") as $bwsidx => $bwscale) { $form .= "<option value=\"{$bwsidx}\""; - + if ($bw['bwscale'] == $bwsidx) { $form .= " selected=\"selected\""; } - + $form .= ">{$bwscale}</option>"; } - + $form .= "</select>"; $form .= "</td>"; $form .= '<td class="col-xs-4">'; $form .= "<select id=\"bwsched{$bwidx}\" name=\"bwsched{$bwidx}\" class=\"form-control\">"; - + foreach ($schedules as $schd) { $selected = ""; if ($bw['bwsched'] == $schd) { $selected = "selected=\"selected\""; } - + $form .= "<option value='{$schd}' {$selected}>{$schd}</option>"; } - + $form .= "</select>"; $form .= "</td>"; $form .= '<td>'; @@ -3850,7 +3850,7 @@ EOD; // if($_GET['newbwrow']) { // array_push($bandwidth, array(count($bandwidth) => array('bw' => '', 'burst' => '', 'bwscale' => 'Kb', 'bwsched' => 'none') )); // } - + if (is_array($bandwidth)) { $section->addInput(new Form_StaticText( 'Bandwidth', diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 4218262..05d6a8c 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* system.inc part of m0n0wall (http://m0n0.ch/wall) diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index d5c5570..428375f 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -3995,13 +3995,13 @@ function upgrade_123_to_124() { require_once("notices.inc"); } file_notice("WirelessSettings", "WEP is no longer supported. It will be disabled on the {$ifname} interface and the interface will be disabled. Please reconfigure the interface."); - unset($config['interfaces'][$ifname]['wireless']['wep']); + unset($config['interfaces'][$ifname]['wireless']['wep']); if (isset($intf['enable'])) { unset($config['interfaces'][$ifname]['enable']); } } } } - + ?> diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index b7df799..1ca1f81 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -1,5 +1,4 @@ <?php - /* vpn.inc Copyright (C) 2004 Scott Ullrich @@ -432,7 +431,7 @@ syslog { ike_name = yes {$strongswanlog} } - # disable logging under auth so logs aren't duplicated + # disable logging under auth so logs aren't duplicated auth { default = -1 } diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc index 05bef31..1c509a9 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* vslb.inc Copyright (C) 2005-2008 Bill Marquette diff --git a/src/etc/inc/xmlparse.inc b/src/etc/inc/xmlparse.inc index 08d9b19..cd44aa5 100644 --- a/src/etc/inc/xmlparse.inc +++ b/src/etc/inc/xmlparse.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* xmlparse.inc functions to parse/dump configuration files in XML format diff --git a/src/etc/inc/xmlparse_attr.inc b/src/etc/inc/xmlparse_attr.inc index ab90e98..c9f6c3a 100644 --- a/src/etc/inc/xmlparse_attr.inc +++ b/src/etc/inc/xmlparse_attr.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* xmlparse_attr.inc functions to parse configuration files in XML format with attributes diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc index 960acb1..99034fc 100644 --- a/src/etc/inc/xmlreader.inc +++ b/src/etc/inc/xmlreader.inc @@ -1,5 +1,4 @@ <?php -/* $Id$ */ /* xmlreader.inc functions to parse/dump configuration files in XML format diff --git a/src/etc/inc/xmlrpc.inc b/src/etc/inc/xmlrpc.inc index e96e783..24771b3 100644 --- a/src/etc/inc/xmlrpc.inc +++ b/src/etc/inc/xmlrpc.inc @@ -1,7 +1,5 @@ <?php /* - $Id$ - xmlrpc.inc Copyright (C) 2005-2006 Colin Smith All rights reserved. diff --git a/src/etc/inc/xmlrpc_server.inc b/src/etc/inc/xmlrpc_server.inc index f4d8a46..627078a 100644 --- a/src/etc/inc/xmlrpc_server.inc +++ b/src/etc/inc/xmlrpc_server.inc @@ -246,7 +246,7 @@ function XML_RPC_Server_debugmsg($m) * ), * 1, * 0 - * ); + * ); * </code> * * @category Web Services @@ -562,8 +562,8 @@ class XML_RPC_Server $XML_RPC_xh[$parser]['isf'] = 0; $XML_RPC_xh[$parser]['params'] = array(); $XML_RPC_xh[$parser]['method'] = ''; - $XML_RPC_xh[$parser]['stack'] = array(); - $XML_RPC_xh[$parser]['valuestack'] = array(); + $XML_RPC_xh[$parser]['stack'] = array(); + $XML_RPC_xh[$parser]['valuestack'] = array(); $plist = ''; |