lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: change all instances to "comma-separated"

Browse Source
This commit is contained in:
Franco Fichtner 2019-01-06 15:04:28 +01:00
parent cd632551ce
commit 2b265279e5
14 changed files with 142 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/google-api-php-client/Google/Service/Directory.php
View File

@ -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

18
contrib/google-api-php-client/Google/Service/MapsEngine.php
View File

@ -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

2
contrib/google-api-php-client/Google/Utils/URITemplate.php
View File

@ -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);

7
src/etc/inc/services.inc
View File

@ -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'])) {

10
src/opnsense/mvc/app/controllers/OPNsense/Cron/forms/dialogEdit.xml
View File

@ -9,31 +9,31 @@
<id>job.minutes</id>
<label>Minutes</label>
<type>text</type>
<help>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)</help>
<help>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)</help>
</field>
<field>
<id>job.hours</id>
<label>Hours</label>
<type>text</type>
<help>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)</help>
<help>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)</help>
</field>
<field>
<id>job.days</id>
<label>Day of the month</label>
<type>text</type>
<help>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)</help>
<help>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)</help>
</field>
<field>
<id>job.months</id>
<label>Months</label>
<type>text</type>
<help>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)</help>
<help>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)</help>
</field>
<field>
<id>job.weekdays</id>
<label>Days of the week</label>
<type>text</type>
<help>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)</help>
<help>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)</help>
</field>
<field>
<id>job.command</id>

2
src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml
View File

@ -23,7 +23,7 @@
<type>select_multiple</type>
<allownew>true</allownew>
<style>tokenize</style>
<help><![CDATA[Comma separated list of SMTP servers for alert delivery.]]></help>
<help><![CDATA[Comma-separated list of SMTP servers for alert delivery.]]></help>
</field>
<field>
<id>monit.general.port</id>

24
src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
View File

@ -41,7 +41,7 @@
<label>Ignore hosts in access.log</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Type subnets/addresses you want to ignore for the access.log <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<help><![CDATA[Type subnets/addresses you want to ignore for the access.log <div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type subnet addresses (ex. 192.168.2.0/24)</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -51,7 +51,7 @@
<label>Use alternate DNS-servers</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Type IPs of alternative DNS servers you like to use. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<help><![CDATA[Type IPs of alternative DNS servers you like to use. <div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type IP addresses, followed by Enter or comma.</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -331,7 +331,7 @@
<label>Allowed Subnets</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Type subnets you want to allow access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<help><![CDATA[Type subnets you want to allow access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type subnet addresses (ex. 192.168.2.0/24)</hint>
<allownew>true</allownew>
</field>
@ -340,7 +340,7 @@
<label>Unrestricted IP addresses</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Type IP addresses you want to allow access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<help><![CDATA[Type IP addresses you want to allow access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type IP addresses (ex. 192.168.1.100)</hint>
<allownew>true</allownew>
</field>
@ -349,7 +349,7 @@
<label>Banned host IP addresses</label>
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Type IP addresses you want to deny access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<help><![CDATA[Type IP addresses you want to deny access to the proxy server, use a comma or press Enter for new item. <div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type IP addresses (ex. 192.168.1.100)</hint>
<allownew>true</allownew>
</field>
@ -367,7 +367,7 @@
<b class="text-primary">\.gif$</b> -> matches on <b>\*.gif</b> but not on <b class="text-danger">\*.gif\test</b><br/>
<b class="text-primary">\[0-9]+\.gif$</b> -> matches on <b>\123.gif</b> but not on <b class="text-danger">\test.gif</b><br/>
</div>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Regular expressions are allowed.</hint>
<allownew>true</allownew>
</field>
@ -385,7 +385,7 @@
<b class="text-primary">\.gif$</b> -> matches on <b>\*.gif</b> but not on <b class="text-danger">\*.gif\test</b><br/>
<b class="text-primary">\[0-9]+\.gif$</b> -> matches on <b>\123.gif</b> but not on <b class="text-danger">\test.gif</b><br/>
</div>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Regular expressions are allowed.</hint>
<allownew>true</allownew>
</field>
@ -401,7 +401,7 @@
<b class="text-primary">^(.)+Macintosh(.)+Firefox/37\.0</b> -> matches on <b>Macintosh version of Firefox revision 37.0</b><br/>
<b class="text-primary">^Mozilla</b> -> matches on <b>all Mozilla based browsers</b><br/>
</div>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Regular expressions are allowed.</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -418,7 +418,7 @@
<b class="text-primary">video/flv</b> -> matches on <b>Flash Video</b><br/>
<b class="text-primary">application/x-javascript</b> -> matches on <b>javascripts</b><br/>
</div>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Regular expressions are allowed.</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -429,7 +429,7 @@
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Allowed destination TCP ports, you may use ranges (ex. 222-226) and add comments with colon (ex. 22:ssh).<br/>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type port number or range.</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -440,7 +440,7 @@
<type>select_multiple</type>
<style>tokenize</style>
<help><![CDATA[Allowed destination SSL ports, you may use ranges (ex. 222-226) and add comments with colon (ex. 22:ssh).<br/>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Type port number or range.</hint>
<allownew>true</allownew>
<advanced>true</advanced>
@ -561,7 +561,7 @@
<b class="text-primary">\.gif$</b> -> matches on <b>\*.gif</b> but not on <b class="text-danger">\*.gif\test</b><br/>
<b class="text-primary">\[0-9]+\.gif$</b> -> matches on <b>\123.gif</b> but not on <b class="text-danger">\test.gif</b><br/>
</div>
<div class="text-info"><b>TIP: </b>You can also paste a comma separated list into this field.</div>]]></help>
<div class="text-info"><b>TIP: </b>You can also paste a comma-separated list into this field.</div>]]></help>
<hint>Regular expressions are allowed.</hint>
<allownew>true</allownew>
</field>

2
src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php
View File

@ -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
*/

46
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CSVListField.php
View File

@ -1,31 +1,31 @@
<?php
/**
* Copyright (C) 2015 Deciso B.V.
/*
* Copyright (C) 2015 Deciso B.V.
* All rights reserved.
*
* All rights reserved.
* 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.
*
* 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.
* 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.
*/
namespace OPNsense\Base\FieldTypes;
use Phalcon\Validation\Validator\Regex;
@ -101,7 +101,7 @@ class CSVListField extends BaseField
/**
* set all options for this select item.
* push a key/value array type to set all options or deliver a comma separated list with keys and optional values
* push a key/value array type to set all options or deliver a comma-separated list with keys and optional values
* divided by a pipe | sign.
* example : optionA|text for option A, optionB|test for option B
* @param array|string $list key/value option list

2
src/sbin/3gstats.php
View File

@ -11,7 +11,7 @@ if (empty($argv[1])) {
/* Huawei example */
$device = "/dev/{$argv[1]}";
$statfile = "/tmp/3gstats.{$argv[2]}";
/* mode is a comma separated value, thus submode is born */
/* mode is a comma-separated value, thus submode is born */
$header = "#seconds,rssi,mode,submode,upstream,downstream,sentbytes,receivedbyts,bwupstream,bwdownstream,simstate,service\n";
$i = 0;

54
src/www/interfaces_ppps_edit.php
View File

@ -1,32 +1,32 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Gabriel B. <gnoahb@gmail.com>
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
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. <gnoahb@gmail.com>
* Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
* 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])) {

4
src/www/services_dhcp.php
View File

@ -913,9 +913,9 @@ include("head.inc");
<input type="button" onclick="show_maccontrol_config()" class="btn btn-default btn-xs" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show MAC Address Control");?>
</div>
<div id="showmaccontrol" style="display:none">
<?= sprintf(gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
<?= sprintf(gettext("Enter a list of partial MAC addresses to allow, comma-separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
<input name="mac_allow" type="text" id="mac_allow" value="<?= $pconfig['mac_allow'] ?>" />
<?= sprintf(gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
<?= sprintf(gettext("Enter a list of partial MAC addresses to deny access, comma-separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
<input name="mac_deny" type="text" id="mac_deny" value="<?= $pconfig['mac_deny'] ?>" /><br />
</div>
</td>

52
src/www/vpn_ipsec_mobile.php
View File

@ -1,31 +1,31 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
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. <mgrooms@shrew.net>
* 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; ?>
<input name="dns_split_enable" type="checkbox" id="dns_split_enable" value="yes" <?= !empty($pconfig['dns_split']) ? "checked=\"checked\"" : "";?> onclick="dns_split_change()" />
<input name="dns_split" type="text" class="form-control" id="dns_split" size="30" value="<?=$pconfig['dns_split'];?>" />
<div class="hidden" data-for="help_for_dns_split_enable">
<?=gettext("Provide a list of split DNS domain names to clients. Enter a comma separated list."); ?><br />
<?=gettext("Provide a list of split DNS domain names to clients. Enter a comma-separated list."); ?><br />
<?=gettext("NOTE: If left blank, and a default domain is set, it will be used for this value."); ?>
</div>
</td>

56
src/www/widgets/widgets/services_status.widget.php
View File

@ -1,33 +1,33 @@
<?php
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2007 Sam Wenham
Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
Copyright (C) 2004-2005 Scott Ullrich <sullrich@gmail.com>
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 <ethethlay@gmail.com>
* Copyright (C) 2004-2005 Scott Ullrich <sullrich@gmail.com>
* 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'])) {
<table class="table table-condensed">
<thead>
<tr>
<th><?= gettext('Comma separated list of services to NOT display in the widget') ?></th>
<th><?= gettext('Comma-separated list of services to NOT display in the widget') ?></th>
</tr>
</thead>
<tbody>