From 2b265279e5b081b2d3b3c62ff11665aede2e3bcc Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 6 Jan 2019 15:04:28 +0100 Subject: [PATCH] src: change all instances to "comma-separated" --- .../Google/Service/Directory.php | 2 +- .../Google/Service/MapsEngine.php | 18 +++--- .../Google/Utils/URITemplate.php | 2 +- src/etc/inc/services.inc | 7 ++- .../OPNsense/Cron/forms/dialogEdit.xml | 10 ++-- .../OPNsense/Monit/forms/general.xml | 2 +- .../controllers/OPNsense/Proxy/forms/main.xml | 24 ++++---- .../app/library/OPNsense/Firewall/Plugin.php | 2 +- .../OPNsense/Base/FieldTypes/CSVListField.php | 46 +++++++-------- src/sbin/3gstats.php | 2 +- src/www/interfaces_ppps_edit.php | 54 +++++++++--------- src/www/services_dhcp.php | 4 +- src/www/vpn_ipsec_mobile.php | 52 ++++++++--------- .../widgets/services_status.widget.php | 56 +++++++++---------- 14 files changed, 142 insertions(+), 139 deletions(-) diff --git a/contrib/google-api-php-client/Google/Service/Directory.php b/contrib/google-api-php-client/Google/Service/Directory.php index 89576ce5e..23d865e18 100644 --- a/contrib/google-api-php-client/Google/Service/Directory.php +++ b/contrib/google-api-php-client/Google/Service/Directory.php @@ -1690,7 +1690,7 @@ class Google_Service_Directory_Members_Resource extends Google_Service_Resource * @param array $optParams Optional parameters. * * @opt_param string pageToken Token to specify next page in the list - * @opt_param string roles Comma separated role values to filter list results + * @opt_param string roles Comma-separated role values to filter list results * on. * @opt_param int maxResults Maximum number of results to return. Default is 200 * @return Google_Service_Directory_Members diff --git a/contrib/google-api-php-client/Google/Service/MapsEngine.php b/contrib/google-api-php-client/Google/Service/MapsEngine.php index 1de230981..9b2912582 100644 --- a/contrib/google-api-php-client/Google/Service/MapsEngine.php +++ b/contrib/google-api-php-client/Google/Service/MapsEngine.php @@ -1551,7 +1551,7 @@ class Google_Service_MapsEngine_Assets_Resource extends Google_Service_Resource * @opt_param string createdAfter An RFC 3339 formatted date-time value (e.g. * 1970-01-01T00:00:00Z). Returned assets will have been created at or after * this time. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string projectId The ID of a Maps Engine project, used to filter * the response. To list all available projects with their IDs, send a Projects: @@ -1577,7 +1577,7 @@ class Google_Service_MapsEngine_Assets_Resource extends Google_Service_Resource * this time. * @opt_param string role The role parameter indicates that the response should * only contain assets where the current user has the specified level of access. - * @opt_param string type A comma separated list of asset types. Returned assets + * @opt_param string type A comma-separated list of asset types. Returned assets * will have one of the types from the provided list. Supported values are * 'map', 'layer', 'rasterCollection' and 'table'. * @return Google_Service_MapsEngine_AssetsListResponse @@ -1754,7 +1754,7 @@ class Google_Service_MapsEngine_Layers_Resource extends Google_Service_Resource * the response. To list all available projects with their IDs, send a Projects: * list request. You can also find your project ID as the value of the * DashboardPlace:cid URL parameter when signed in to mapsengine.google.com. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -2051,7 +2051,7 @@ class Google_Service_MapsEngine_Maps_Resource extends Google_Service_Resource * the response. To list all available projects with their IDs, send a Projects: * list request. You can also find your project ID as the value of the * DashboardPlace:cid URL parameter when signed in to mapsengine.google.com. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -2387,7 +2387,7 @@ class Google_Service_MapsEngine_RasterCollections_Resource extends Google_Servic * the response. To list all available projects with their IDs, send a Projects: * list request. You can also find your project ID as the value of the * DashboardPlace:cid URL parameter when signed in to mapsengine.google.com. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -2604,7 +2604,7 @@ class Google_Service_MapsEngine_RasterCollectionsRasters_Resource extends Google * @opt_param string createdAfter An RFC 3339 formatted date-time value (e.g. * 1970-01-01T00:00:00Z). Returned assets will have been created at or after * this time. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -2692,7 +2692,7 @@ class Google_Service_MapsEngine_Rasters_Resource extends Google_Service_Resource * 1970-01-01T00:00:00Z). Returned assets will have been created at or after * this time. * @opt_param string processingStatus - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -2955,7 +2955,7 @@ class Google_Service_MapsEngine_Tables_Resource extends Google_Service_Resource * the response. To list all available projects with their IDs, send a Projects: * list request. You can also find your project ID as the value of the * DashboardPlace:cid URL parameter when signed in to mapsengine.google.com. - * @opt_param string tags A comma separated list of tags. Returned assets will + * @opt_param string tags A comma-separated list of tags. Returned assets will * contain all the tags from the list. * @opt_param string search An unstructured search string used to filter the set * of results based on asset metadata. @@ -3155,7 +3155,7 @@ class Google_Service_MapsEngine_TablesFeatures_Resource extends Google_Service_R * Data for information. * @opt_param string limit The total number of features to return from the * query, irrespective of the number of pages. - * @opt_param string include A comma separated list of optional data to include. + * @opt_param string include A comma-separated list of optional data to include. * Optional data available: schema. * @opt_param string where An SQL-like predicate used to filter results. * @opt_param string select A SQL-like projection clause used to specify diff --git a/contrib/google-api-php-client/Google/Utils/URITemplate.php b/contrib/google-api-php-client/Google/Utils/URITemplate.php index 99f9bcac7..d03b369cd 100644 --- a/contrib/google-api-php-client/Google/Utils/URITemplate.php +++ b/contrib/google-api-php-client/Google/Utils/URITemplate.php @@ -99,7 +99,7 @@ class Google_Utils_URITemplate $data = $this->replaceVars($data, $parameters, ",", null, true); break; case "fragment": - // Comma separated with fragment prefix. Bare values only. + // Comma-separated with fragment prefix. Bare values only. $prefix = "#"; $prefix_on_missing = true; $data = $this->replaceVars($data, $parameters, ",", null, true); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 0c40fb030..045d4c58b 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -643,8 +643,11 @@ EOPP; } } - /* Create classes - These all contain comma separated lists. Join them into one - big comma separated string then split them all up. */ + /* + * Create classes - These all contain comma-separated lists. + * Join them into one big comma-separated string then split + * them all up. + */ $all_mac_strings = array(); foreach ($all_pools as $poolconf) { if (!empty($poolconf['mac_allow'])) { diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml b/src/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml index 0c153ecd0..f40c5c5e3 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml @@ -9,31 +9,31 @@ job.minutes text - Enter the minutes for the job to act, can also be a comma separated list, * (each) or a range (ex. 10,20,30 or 10-30) + Enter the minutes for the job to act, can also be a comma-separated list, * (each) or a range (ex. 10,20,30 or 10-30) job.hours text - Enter the hours for the job to act, can also be a comma separated list, * (each) or a range (ex. 10,11,12 or 10-12) + Enter the hours for the job to act, can also be a comma-separated list, * (each) or a range (ex. 10,11,12 or 10-12) job.days text - Enter the days of the month for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,20,28 or 1-28) + Enter the days of the month for the job to act, can also be a comma-separated list, * (each) or a range (ex. 1,20,28 or 1-28) job.months text - Enter the months for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,2,3 or 1-3) + Enter the months for the job to act, can also be a comma-separated list, * (each) or a range (ex. 1,2,3 or 1-3) job.weekdays text - Enter the days of the week for the job to act, can also be a comma separated list, * (each) or a range (ex. 1,2,3 or 1-3) + Enter the days of the week for the job to act, can also be a comma-separated list, * (each) or a range (ex. 1,2,3 or 1-3) job.command diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml index b9b8b0e54..8d92f5bb0 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml @@ -23,7 +23,7 @@ select_multiple true - + monit.general.port diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml index 73d94a68a..e4c60526b 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml @@ -41,7 +41,7 @@ select_multiple - TIP: You can also paste a comma separated list into this field.]]> + TIP: You can also paste a comma-separated list into this field.]]> Type subnet addresses (ex. 192.168.2.0/24) true true @@ -51,7 +51,7 @@ select_multiple - TIP: You can also paste a comma separated list into this field.]]> + TIP: You can also paste a comma-separated list into this field.]]> Type IP addresses, followed by Enter or comma. true true @@ -331,7 +331,7 @@ select_multiple - TIP: You can also paste a comma separated list into this field.]]> + TIP: You can also paste a comma-separated list into this field.]]> Type subnet addresses (ex. 192.168.2.0/24) true @@ -340,7 +340,7 @@ select_multiple - TIP: You can also paste a comma separated list into this field.]]> + TIP: You can also paste a comma-separated list into this field.]]> Type IP addresses (ex. 192.168.1.100) true @@ -349,7 +349,7 @@ select_multiple - TIP: You can also paste a comma separated list into this field.]]> + TIP: You can also paste a comma-separated list into this field.]]> Type IP addresses (ex. 192.168.1.100) true @@ -367,7 +367,7 @@ \.gif$ -> matches on \*.gif but not on \*.gif\test
\[0-9]+\.gif$ -> matches on \123.gif but not on \test.gif
-
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Regular expressions are allowed. true @@ -385,7 +385,7 @@ \.gif$ -> matches on \*.gif but not on \*.gif\test
\[0-9]+\.gif$ -> matches on \123.gif but not on \test.gif
-
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Regular expressions are allowed. true @@ -401,7 +401,7 @@ ^(.)+Macintosh(.)+Firefox/37\.0 -> matches on Macintosh version of Firefox revision 37.0
^Mozilla -> matches on all Mozilla based browsers
-
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Regular expressions are allowed. true true @@ -418,7 +418,7 @@ video/flv -> matches on Flash Video
application/x-javascript -> matches on javascripts
-
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Regular expressions are allowed. true true @@ -429,7 +429,7 @@ select_multiple -
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Type port number or range. true true @@ -440,7 +440,7 @@ select_multiple -
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Type port number or range. true true @@ -561,7 +561,7 @@ \.gif$ -> matches on \*.gif but not on \*.gif\test
\[0-9]+\.gif$ -> matches on \123.gif but not on \test.gif
-
TIP: You can also paste a comma separated list into this field.
]]> +
TIP: You can also paste a comma-separated list into this field.
]]> Regular expressions are allowed. true diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php index 094ee8f0c..33d8755d9 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php @@ -206,7 +206,7 @@ class Plugin /** * fetch anchors as text (pf ruleset part) - * @param string $types anchor types (fw for filter, other options are nat,rdr,binat. comma separated) + * @param string $types anchor types (fw for filter, other options are nat,rdr,binat. comma-separated) * @param string $placement placement head,tail * @return string */ diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php index d2053f01e..73ad8dda9 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php @@ -1,31 +1,31 @@ - Copyright (C) 2003-2004 Manuel Kasper - 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 - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (C) 2014-2015 Deciso B.V. + * Copyright (C) 2010 Gabriel B. + * Copyright (C) 2003-2004 Manuel Kasper + * 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 + * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ require_once("guiconfig.inc"); require_once("interfaces.inc"); @@ -51,7 +51,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig[$fieldname] = null; } } - // fields containing array data (comma separated) + // fields containing array data (comma-separated) $explode_fields = array('mtu', 'mru', 'mrru', 'bandwidth', 'localip', 'gateway', 'localip', 'subnet', 'ports'); foreach ($explode_fields as $fieldname) { if (isset($a_ppps[$id][$fieldname])) { diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php index db81a4ec5..67c95fb53 100644 --- a/src/www/services_dhcp.php +++ b/src/www/services_dhcp.php @@ -913,9 +913,9 @@ include("head.inc"); " /> - diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php index 5f96c85e9..7551f9d8a 100644 --- a/src/www/vpn_ipsec_mobile.php +++ b/src/www/vpn_ipsec_mobile.php @@ -1,31 +1,31 @@ - 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 - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (C) 2014-2015 Deciso B.V. + * Copyright (C) 2008 Shrew Soft Inc. + * 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 + * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ require_once("guiconfig.inc"); require_once("interfaces.inc"); @@ -459,7 +459,7 @@ endfor; ?> onclick="dns_split_change()" /> diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php index 1a1ded4c3..b0d699802 100644 --- a/src/www/widgets/widgets/services_status.widget.php +++ b/src/www/widgets/widgets/services_status.widget.php @@ -1,33 +1,33 @@ - Copyright (C) 2004-2005 Scott Ullrich - 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 - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ + * Copyright (C) 2014 Deciso B.V. + * Copyright (C) 2007 Sam Wenham + * Copyright (C) 2005-2006 Colin Smith + * Copyright (C) 2004-2005 Scott Ullrich + * 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 + * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ require_once("guiconfig.inc"); require_once("services.inc"); @@ -49,7 +49,7 @@ if (isset($_POST['servicestatusfilter'])) { - +