diff options
| -rw-r--r-- | src/etc/inc/auth.inc | 4 | ||||
| -rw-r--r-- | src/etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/meta.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/index.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/services_captiveportal.php | 16 | ||||
| -rw-r--r-- | src/usr/local/www/system_gateways_edit.php | 8 |
6 files changed, 18 insertions, 18 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 34465a4..8522f37 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -1462,7 +1462,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) { $retvalue['auth_val'] = 1; $retvalue['error'] = $rauth->getError(); if ($debug) { - printf(gettext("RADIUS start: %s<br />\n"), $retvalue['error']); + printf(gettext("RADIUS start: %s") . "<br />\n", $retvalue['error']); } } @@ -1474,7 +1474,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) { $retvalue['auth_val'] = 1; $retvalue['error'] = $result->getMessage(); if ($debug) { - printf(gettext("RADIUS send failed: %s<br />\n"), $retvalue['error']); + printf(gettext("RADIUS send failed: %s") . "<br />\n", $retvalue['error']); } } else if ($result === true) { if ($rauth->getAttributes()) { diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 1889fda..04b90f0 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -4528,7 +4528,7 @@ function DHCP_Config_File_Override($wancfg, $wanif) { $dhclientconf = @file_get_contents($wancfg['adv_dhcp_config_file_override_path']); if ($dhclientconf === false) { - log_error(sprintf(gettext("Error: cannot open %s in DHCP_Config_File_Override() for reading.\n"), $wancfg['adv_dhcp_config_file_override_path'])); + log_error(sprintf(gettext("Error: cannot open %s in DHCP_Config_File_Override() for reading."), $wancfg['adv_dhcp_config_file_override_path'])); return ''; } else { return DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf); diff --git a/src/etc/inc/meta.inc b/src/etc/inc/meta.inc index f366072..b3549e5 100644 --- a/src/etc/inc/meta.inc +++ b/src/etc/inc/meta.inc @@ -58,7 +58,7 @@ function list_phpfiles($path, & $found) { $dir = opendir($path); if (!$dir) { - printf(gettext("list_phpfiles: unable to examine path %s\n"), $path); + printf(gettext("list_phpfiles: unable to examine path %s") . "\n", $path); return; } @@ -94,7 +94,7 @@ function read_file_metadata($fpath, & $metadata, $taglist = false) { $fdata = @file_get_contents($fpath); if (!$fdata) { - printf(gettext("unable to read %s\n"), $fpath); + printf(gettext("unable to read %s") . "\n", $fpath); continue; } diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 59e56c2..f413a83 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -188,7 +188,7 @@ if (file_exists('/conf/trigger_initial_wizard')) { <div class="container"> <div class="col-sm-offset-3 col-sm-6 col-xs-12"> <font color="white"> - <p><h3><?=sprintf(gettext("Welcome to %s!\n"), $g['product_name'])?></h3></p> + <p><h3><?=sprintf(gettext("Welcome to %s!") . "\n", $g['product_name'])?></h3></p> <p><?=gettext("One moment while the initial setup wizard starts.")?></p> <p><?=gettext("Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal GUI.")?></p> <p><?=sprintf(gettext("To bypass the wizard, click on the %s logo on the initial page."), $g['product_name'])?></p> diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index d856356..ffd46e8 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -1059,14 +1059,14 @@ $section->addInput(new Form_Input( 'with a submit button (name="accept") and a hidden field with name="redirurl" and value="$PORTAL_REDIRURL$". ' . 'Include the "auth_user" and "auth_pass" and/or "auth_voucher" input fields if authentication is enabled, otherwise it will always fail.' . '<br />' . 'Example code for the form:' . '<br />' . - '<form method="post" action="$PORTAL_ACTION$"><br /> - <input name="auth_user" type="text"><br /> - <input name="auth_pass" type="password"><br /> - <input name="auth_voucher" type="text"><br /> - <input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$"><br /> - <input name="zone" type="hidden" value="$PORTAL_ZONE$"><br /> - <input name="accept" type="submit" value="Continue"><br /> - </form>')->addClass('btn btn-info btn-sm'); + '<form method="post" action="$PORTAL_ACTION$"><br />' . + ' <input name="auth_user" type="text"><br />' . + ' <input name="auth_pass" type="password"><br />' . + ' <input name="auth_voucher" type="text"><br />' . + ' <input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$"><br />' . + ' <input name="zone" type="hidden" value="$PORTAL_ZONE$"><br />' . + ' <input name="accept" type="submit" value="Continue"><br />' . + '</form>')->addClass('btn btn-info btn-sm'); list($host) = explode(":", $_SERVER['HTTP_HOST']); $zoneid = $pconfig['zoneid'] ? $pconfig['zoneid'] : 8000; diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index b8afd21..c56dcd8 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -737,8 +737,8 @@ $group->add(new Form_Input( $pconfig['latencyhigh'], ['placeholder' => $dpinger_default['latencyhigh']] )); -$group->setHelp('Low and high thresholds for latency in milliseconds. - Default is %d/%d.', [$dpinger_default['latencylow'], $dpinger_default['latencyhigh']]); +$group->setHelp('Low and high thresholds for latency in milliseconds. ' . + 'Default is %d/%d.', [$dpinger_default['latencylow'], $dpinger_default['latencyhigh']]); $section->add($group); @@ -757,8 +757,8 @@ $group->add(new Form_Input( $pconfig['losshigh'], ['placeholder' => $dpinger_default['losshigh']] )); -$group->setHelp('Low and high thresholds for packet loss in %%. - Default is %d/%d.', [$dpinger_default['losslow'], $dpinger_default['losshigh']]); +$group->setHelp('Low and high thresholds for packet loss in %%. ' . + 'Default is %d/%d.', [$dpinger_default['losslow'], $dpinger_default['losshigh']]); $section->add($group); $section->addInput(new Form_Input( |
