summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2017-02-03 10:07:00 -0500
committerSteve Beaver <sbeaver@netgate.com>2017-02-03 10:07:00 -0500
commit4b329613ee7bb2dc85dd72035709853b83061a58 (patch)
tree4b0896d6005c9dda4cd8ab678e022e8d342386bd
parent4dc9ba9fae8c63abe414d9bf76a0c73e8ef004af (diff)
downloadpfsense-4b329613ee7bb2dc85dd72035709853b83061a58.zip
pfsense-4b329613ee7bb2dc85dd72035709853b83061a58.tar.gz
Fix #7202
Fix several sprintf errors by escaping '%'s and removing '[ ]' which had been use to pass arguments to setHelp as an array.
-rw-r--r--src/usr/local/www/services_dyndns_edit.php4
-rw-r--r--src/usr/local/www/system_gateways_edit.php8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php
index a385326..eeaacb1 100644
--- a/src/usr/local/www/services_dyndns_edit.php
+++ b/src/usr/local/www/services_dyndns_edit.php
@@ -328,7 +328,7 @@ $section->addInput(new Form_Checkbox(
$pconfig['proxied']
))->setHelp('Note: This enables CloudFlares Virtual DNS proxy. When Enabled it will route all traffic '.
'through their servers. By Default this is disabled and your Real IP is exposed.'.
- 'More info: <a href="https://blog.cloudflare.com/announcing-virtual-dns-ddos-mitigation-and-global-distribution-for-dns-traffic/" target="_blank">CloudFlare Blog</a>');
+ 'More info: %s', '<a href="https://blog.cloudflare.com/announcing-virtual-dns-ddos-mitigation-and-global-distribution-for-dns-traffic/" target="_blank">CloudFlare Blog</a>');
$section->addInput(new Form_Checkbox(
'verboselog',
@@ -391,7 +391,7 @@ $section->addInput(new Form_Textarea(
'Result Match',
$pconfig['resultmatch']
))->sethelp('This field should be identical to what the DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.' . '<br />' .
- 'To include the new IP in the request, put %IP% in its place.' . '<br />' .
+ 'To include the new IP in the request, put %%IP%% in its place.' . '<br />' .
'To include multiple possible values, separate them with a |. If the provider includes a |, escape it with \\|)' . '<br />' .
'Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.');
diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php
index c56dcd8..ef16244 100644
--- a/src/usr/local/www/system_gateways_edit.php
+++ b/src/usr/local/www/system_gateways_edit.php
@@ -738,7 +738,7 @@ $group->add(new Form_Input(
['placeholder' => $dpinger_default['latencyhigh']]
));
$group->setHelp('Low and high thresholds for latency in milliseconds. ' .
- 'Default is %d/%d.', [$dpinger_default['latencylow'], $dpinger_default['latencyhigh']]);
+ 'Default is %d/%d.', $dpinger_default['latencylow'], $dpinger_default['latencyhigh']);
$section->add($group);
@@ -758,7 +758,7 @@ $group->add(new Form_Input(
['placeholder' => $dpinger_default['losshigh']]
));
$group->setHelp('Low and high thresholds for packet loss in %%. ' .
- 'Default is %d/%d.', [$dpinger_default['losslow'], $dpinger_default['losshigh']]);
+ 'Default is %d/%d.', $dpinger_default['losslow'], $dpinger_default['losshigh']);
$section->add($group);
$section->addInput(new Form_Input(
@@ -779,7 +779,7 @@ $section->addInput(new Form_Input(
$pconfig['loss_interval'],
['placeholder' => $dpinger_default['loss_interval']]
))->setHelp('Time interval in milliseconds before packets are treated as lost. '.
- 'Default is %d.', [$dpinger_default['loss_interval']]);
+ 'Default is %d.', $dpinger_default['loss_interval']);
$group = new Form_Group('Time Period');
$group->add(new Form_Input(
@@ -792,7 +792,7 @@ $group->add(new Form_Input(
]
));
$group->setHelp('Time period in milliseconds over which results are averaged. Default is %d.',
- [$dpinger_default['time_period']]);
+ $dpinger_default['time_period']);
$section->add($group);
$group = new Form_Group('Alert interval');
OpenPOWER on IntegriCloud