diff options
Diffstat (limited to 'usr')
84 files changed, 552 insertions, 541 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 69d1401..543d3d7 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -136,7 +136,7 @@ include("head.inc"); </tr> <?php if ($carpcount == 0) { - echo "</td></tr></table></table></div><center><br>" . gettext("Could not locate any defined CARP interfaces") . "."; + echo "</td></tr></table></table></div><center><br>" . gettext("Could not locate any defined CARP interfaces."); echo "</center>"; include("fend.inc"); diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 3aff783..fa6cee3 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -235,7 +235,7 @@ foreach ($rawdata as $line) { } } -function getHostName($mac,$ip) +function _getHostName($mac,$ip) { global $dhcpmac, $dhcpip; @@ -273,7 +273,7 @@ ob_implicit_flush(1); // is to sort the list by hostnames, alpha and then the non // resolvable addresses will appear last in the list. foreach ($data as &$entry) { - $dns = trim(getHostName($entry['mac'], $entry['ip'])); + $dns = trim(_getHostName($entry['mac'], $entry['ip'])); if(trim($dns)) $entry['dnsresolve'] = "$dns"; else diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 882240f..e23a279 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -272,7 +272,7 @@ if ($_POST) { /* read the file contents */ $data = file_get_contents($_FILES['conffile']['tmp_name']); if(!$data) { - log_error(gettext("Warning, could not read file") . " " . $_FILES['conffile']['tmp_name']); + log_error(sprintf(gettext("Warning, could not read file %s"), $_FILES['conffile']['tmp_name'])); return 1; } @@ -301,7 +301,7 @@ if ($_POST) { } } else { if(!stristr($data, "<" . $g['xml_rootobj'] . ">")) { - $input_errors[] = gettext("You have selected to restore the full configuration but we could not locate a") . " " . $g['xml_rootobj'] . " " . gettext("tag."); + $input_errors[] = sprintf(gettext("You have selected to restore the full configuration but we could not locate a %s tag."), $g['xml_rootobj']); } else { /* restore the entire configuration */ file_put_contents($_FILES['conffile']['tmp_name'], $data); @@ -584,7 +584,7 @@ function backuparea_change(obj) { <table id="encrypt_opts"> <tr> <td> - <span class="vexpl"><?=gettext("Password"); ?> :</span> + <span class="vexpl"><?=gettext("Password:"); ?> </span> </td> <td> <input name="encrypt_password" type="password" class="formfld pwd" size="20" value="" /> @@ -592,7 +592,7 @@ function backuparea_change(obj) { </tr> <tr> <td> - <span class="vexpl"><?=gettext("confirm"); ?> :</span> + <span class="vexpl"><?=gettext("confirm:"); ?> </span> </td> <td> <input name="encrypt_passconf" type="password" class="formfld pwd" size="20" value="" /> @@ -642,7 +642,7 @@ function backuparea_change(obj) { </tr> </table> <p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>"></p> - <p><strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p> + <p><strong><span class="red"><?=gettext("Note:"); ?></span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p> </td> </tr> <?php if($config['installedpackages']['package'] != "") { ?> diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index ec1f100..f02d2de 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -106,7 +106,7 @@ include("head.inc"); if($savemsg) print_info_box($savemsg); ?> - <? if ($diff) { ?> + <?php if ($diff) { ?> <table align="center" valign="middle" width="100%" border="0" cellspacing="0" style="padding-top: 4px; padding-bottom: 4px;"> <tr><td><?=gettext("Configuration diff from");?> <?php echo date(gettext("n/j/y H:i:s"), $oldtime); ?> <?=gettext("to");?> <?php echo date(gettext("n/j/y H:i:s"), $newtime); ?></td></tr> <?php foreach ($diff as $line) { @@ -130,7 +130,7 @@ include("head.inc"); <?php } ?> </table> <br /> - <? } ?> + <?php } ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> @@ -178,9 +178,9 @@ include("head.inc"); <td class="list"> <?php if ($c < (count($confvers) - 1)) { ?> <input type="radio" name="newtime" value="<?php echo $version['time'];?>"> - <? } else { ?> + <?php } else { ?> - <? } + <?php } $c++; ?> </td> <td class="listlr"> <?= $date ?></td> diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index cde9d54..85c05da 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -64,7 +64,7 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?> <form action="diag_defaults.php" method="post"> - <p><strong> <?=gettext("If you click") . " "" . gettext("Yes") . "", " . gettext("the firewall will")?>: + <p><strong> <?=gettext("If you click") . " "" . gettext("Yes") . "", " . gettext("the firewall will:")?> <ul> <li><?=gettext("Reset to factory defaults");?></li> diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index a98b943..108f138 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -132,9 +132,9 @@ include("head.inc"); <form action="<?=$_SERVER['SCRIPT_NAME'];?>" method="get"> <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Current state count");?>: <?=$current_statecount?></td> + <td><?=gettext("Current state count:");?> <?=$current_statecount?></td> <td style="font-weight:bold;" align="right"> - <?=gettext("Filter expression");?>: + <?=gettext("Filter expression:");?> <input type="text" name="filter" class="formfld search" value="<?=$_GET['filter'];?>" size="30" /> <input type="submit" class="formbtn" value="<?=gettext("Filter");?>" /> <td> diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 99b9864..0c4d96e 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -132,7 +132,7 @@ $sad = ipsec_dump_sad(); <span class="vexpl"> <span class="red"> - <strong><?=gettext("Note");?>:<br /></strong> + <strong><?=gettext("Note:");?><br /></strong> </span> <?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php">here</a>. diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 4400055..7ee8b72 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -107,7 +107,7 @@ if ($_GET['act'] == "del") { $args .= "&proto=" . rawurlencode($sa['proto']); $args .= "&spi=" . rawurlencode("0x" . $sa['spi']); ?> - <a href="diag_ipsec_sad.php?act=del&<?=$args;?>" onclick="return confirm('Do you really want to delete this security association?')"> + <a href="diag_ipsec_sad.php?act=del&<?=$args;?>" onclick="return confirm('<?=gettext("Do you really want to delete this security association?"); ?>')"> <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"> </a> </td> @@ -129,8 +129,8 @@ if ($_GET['act'] == "del") { <p/> <span class="vexpl"> -<span class="red"><strong><?=gettext("Note");?>:<br></strong></span> -<?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here");?></a>. +<span class="red"><strong><?=gettext("Note:");?><br></strong></span> +<?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here.");?></a> </span> <?php include("fend.inc"); ?> diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 8621e59..4de5a7f 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -140,8 +140,8 @@ $spd = ipsec_dump_spd(); <p> <span class="vexpl"> -<span class="red"><strong><?= gettext("Note"); ?>:<br></strong></span> -<?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here"); ?></a>. +<span class="red"><strong><?= gettext("Note:"); ?><br></strong></span> +<?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here."); ?></a> </span> <?php include("fend.inc"); ?> diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 52a2076..82cf179 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -118,7 +118,7 @@ include("head.inc"); <a href="diag_logs_filter.php"><?=gettext("Normal View");?></a> | <?=gettext("Dynamic View");?> | <a href="diag_logs_filter_summary.php"><?=gettext("Summary View");?></a> </div> <div class="listtopic"> - <?php printf(gettext("Last %s records"),$nentries);?>; <?=gettext("Pause");?>:<input valign="middle" type="checkbox" onClick="javascript:toggle_pause();"> + <?php printf(gettext("Last %s records"),$nentries);?>; <?=gettext("Pause:");?><input valign="middle" type="checkbox" onClick="javascript:toggle_pause();"> </div> <div id="log"> <div class="log-header"> @@ -149,7 +149,7 @@ include("head.inc"); </td> </tr> </table> -<p><span class="vexpl"><a href="http://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">TCP Flags</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR</span></p> +<p><span class="vexpl"><a href="http://doc.pfsense.org/index.php/What_are_TCP_Flags%3F"><?=gettext("TCP Flags"); ?></a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR</span></p> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index e7fdb93..9d854cb 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -191,7 +191,7 @@ function enable_change(enable_over) { </tr> <tr> <td width="22%" valign="top" class="vtable"> </td> - <td width="78%" class="vtable"><?=gettext("Number of log entries to show") . ":"?> + <td width="78%" class="vtable"><?=gettext("Number of log entries to show:")?> <input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"></td> </tr> <tr> @@ -271,7 +271,7 @@ function enable_change(enable_over) { </tr> <tr> <td width="22%" height="53" valign="top"> </td> - <td width="78%"><strong><span class="red"><?=gettext("Note") . ":"?></span></strong><br> + <td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br> <?=gettext("syslog sends UDP datagrams to port 514 on the specified " . "remote syslog server. Be sure to set syslogd on the " . "remote server to accept syslog messages from");?> <?=$g['product_name']?>. diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 2ddcf9e..c0dcfed 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -125,7 +125,7 @@ if ($savemsg) <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE") . ":"?> </strong> + <strong><?=gettext("NOTE:")?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only.")?> <br/> @@ -145,7 +145,7 @@ if ($savemsg) <td width="22%" valign="top" class="vncell"><?=gettext("Bootup");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - <?=gettext("Bootup slice is currently");?>: <?php echo $ACTIVE_SLICE; ?> + <?=gettext("Bootup slice is currently:");?> <?php echo $ACTIVE_SLICE; ?> <br/><br/><?=gettext("This will switch the bootup slice to the alternate slice.");?> <br/> <input type='hidden' name='bootslice' value='switch'> @@ -162,7 +162,7 @@ if ($savemsg) <td width="22%" valign="top" class="vncell"><?=gettext("Duplicate bootup slice");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - <?=gettext("Destination slice");?>: + <?=gettext("Destination slice:");?> <select name='destslice'> <option value='<?php echo $COMPLETE_PATH; ?>'> <?php echo "{$COMPLETE_BOOT_PATH} -> {$TOFLASH}"; ?> @@ -185,11 +185,11 @@ if ($savemsg) <td width="22%" valign="top" class="vncell"><?=gettext("RRD Backup");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - <?=gettext("Frequency");?>: + <?=gettext("Frequency:");?> <select name='rrdbackup'> - <option value='0' <? if (!isset($config['system']['rrdbackup']) || ($config['system']['rrdbackup'] == 0)) echo "selected"; ?>>Disable</option> + <option value='0' <? if (!isset($config['system']['rrdbackup']) || ($config['system']['rrdbackup'] == 0)) echo "selected"; ?>><?=gettext("Disable"); ?></option> <? for ($x=1; $x<=24; $x++) { ?> - <option value='<?= $x ?>' <? if ($config['system']['rrdbackup'] == $x) echo "selected"; ?>><?= $x ?> hour<? if ($x>1) echo "s"; ?></option> + <option value='<?= $x ?>' <? if ($config['system']['rrdbackup'] == $x) echo "selected"; ?>><?= $x ?> <?=gettext("hour"); ?><? if ($x>1) echo "s"; ?></option> <? } ?> </select> <br/> @@ -202,11 +202,11 @@ if ($savemsg) <td width="22%" valign="top" class="vncell"><?=gettext("DHCP Leases Backup");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - <?=gettext("Frequency");?>: + <?=gettext("Frequency:");?> <select name='dhcpbackup'> - <option value='0' <? if (!isset($config['system']['dhcpbackup']) || ($config['system']['dhcpbackup'] == 0)) echo "selected"; ?>>Disable</option> + <option value='0' <? if (!isset($config['system']['dhcpbackup']) || ($config['system']['dhcpbackup'] == 0)) echo "selected"; ?>><?=gettext("Disable"); ?></option> <? for ($x=1; $x<=24; $x++) { ?> - <option value='<?= $x ?>' <? if ($config['system']['dhcpbackup'] == $x) echo "selected"; ?>><?= $x ?> hour<? if ($x>1) echo "s"; ?></option> + <option value='<?= $x ?>' <? if ($config['system']['dhcpbackup'] == $x) echo "selected"; ?>><?= $x ?> <?=gettext("hour"); ?><? if ($x>1) echo "s"; ?></option> <? } ?> </select> <br/> @@ -216,7 +216,7 @@ if ($savemsg) </td> </tr> <tr> - <td valign="top" class=""> </td><td><br/><input type='submit' value='Save'></form></td> + <td valign="top" class=""> </td><td><br/><input type='submit' value='<?=gettext("Save"); ?>'></form></td> </tr> <?php if(file_exists("/conf/upgrade_log.txt")): ?> <tr> diff --git a/usr/local/www/diag_overload_tables.php b/usr/local/www/diag_overload_tables.php index e4bba75..9c409c6 100644 --- a/usr/local/www/diag_overload_tables.php +++ b/usr/local/www/diag_overload_tables.php @@ -94,7 +94,7 @@ include("fbegin.inc"); } </script> -<?=gettext("Table");?>: +<?=gettext("Table:");?> <select id='type' onChange='method_change($F("type"));' name='type'> <?php foreach ($tables as $table) { echo "<option name='{$table}' value='{$table}'"; diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index de314a9..2bff911 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -124,7 +124,7 @@ include("fbegin.inc"); </option> <?php endforeach;?> </select> - <br/><?=gettext("Select the interface on which to capture traffic. ");?> + <br/><?=gettext("Select the interface on which to capture traffic.");?> </td> </tr> <tr> @@ -133,7 +133,7 @@ include("fbegin.inc"); <input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>"> <br/><?=gettext("This value is either the Source or Destination IP address. The packet capture will look for this address in either field.");?> <br/><?=gettext("This value can be a domain name or IP address.");?> - <br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured. ");?> + <br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?> </td> </tr> <tr> @@ -167,7 +167,7 @@ include("fbegin.inc"); <option value="-vv -e" <?php if ($detail == "-vv -e") echo "selected"; ?>><?=gettext("Full");?></option> </select> <br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") . "<br/><b>" . - gettext("Note") . ":</b> " . + gettext("Note:") . "</b> " . gettext("This option does not affect the level of detail when downloading the packet capture.");?> </tr> <tr> @@ -191,14 +191,14 @@ include("fbegin.inc"); if ($processcheck != false) $processisrunning = true; - if (($action == gettext("Stop") or $action == "") and $processisrunning != true) + if (($action == "Stop" or $action == "") and $processisrunning != true) echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\"> "; else { echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\"> "; } if (file_exists($fp.$fn) and $processisrunning != true) { echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">"; - echo " (" . gettext("The packet capture file was last updated") . ": " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")"; + echo " (" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")"; } ?> </td> @@ -240,7 +240,7 @@ include("fbegin.inc"); mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $searchhost $searchport"); } else { //action = stop - echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured") . ":</strong><br/>"); + echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured:") . "</strong><br/>"); ?> <textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly"> <?php diff --git a/usr/local/www/diag_patterns.php b/usr/local/www/diag_patterns.php index 09f5472..846a81a 100755 --- a/usr/local/www/diag_patterns.php +++ b/usr/local/www/diag_patterns.php @@ -105,7 +105,7 @@ pre { <td colspan="2" valign="top" class="vnsepcell"><?=gettext("Upload");?></td> </tr> <tr> - <td align="right"><?=gettext("File to upload");?>:</td> + <td align="right"><?=gettext("File to upload:");?></td> <td valign="top" class="label"> <input name="ulfile" type="file" class="formfld file" id="ulfile"> </td></tr> diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index 5adc7b3..f8e2926 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -69,7 +69,7 @@ include('head.inc'); <input type="submit" class="formbtn" name="submit" value="<?=gettext("Show"); ?>" /> <br /> <br /> -<span class="vexpl"><span class="red"><strong><?=gettext("Note")?>:</strong></span><?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at"."any time by clicking the Stop button in your browser");?>.</span> +<span class="vexpl"><span class="red"><strong><?=gettext("Note:")?></strong></span><?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser");?>.</span> </td> </tr> @@ -87,7 +87,7 @@ include('head.inc'); ?> <table class="tabcont" width="100%" cellspacing="0" cellpadding="6" border="0"> <tr><td class="listbg" colspan="<?=$elements?>"><strong><?=$name;?></strong></font></td></tr> -<? +<?php foreach (explode("\n", $table) as $i => $line) { if ($i == 0) continue; diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php index 95f71ec..94b3946 100644 --- a/usr/local/www/diag_showbogons.php +++ b/usr/local/www/diag_showbogons.php @@ -87,7 +87,7 @@ pre { font-size: 1.15em; } <tr> <td> <font size="+1"> - <b><?=gettext("Currently loaded bogons table");?>:</b><p/> + <b><?=gettext("Currently loaded bogons table:");?></b><p/> <pre> <?php echo $bogons; ?> </pre> diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php index 6d42b51..690155e 100644 --- a/usr/local/www/diag_smart.php +++ b/usr/local/www/diag_smart.php @@ -11,7 +11,7 @@ require("guiconfig.inc"); -$pgtitle = array("Diagnostics", "S.M.A.R.T. Monitor Tools"); +$pgtitle = array(gettext("Diagnostics"), gettext("S.M.A.R.T. Monitor Tools")); $smartctl = "/usr/local/sbin/smartctl"; $smartd = "/usr/local/sbin/smartd"; $start_script = "/usr/local/etc/rc.d/smartd.sh"; @@ -65,9 +65,9 @@ function add_colors($string) $patterns[0] = '/PASSED/'; $patterns[1] = '/FAILED/'; $patterns[2] = '/Warning/'; - $replacements[0] = '<b><font color="#00ff00">PASSED</font></b>'; - $replacements[1] = '<b><font color="#ff0000">FAILED</font></b>'; - $replacements[2] = '<font color="#ff0000">Warning</font>'; + $replacements[0] = '<b><font color="#00ff00">' . gettext("PASSED") . '</font></b>'; + $replacements[1] = '<b><font color="#ff0000">' . gettext("FAILED") . '</font></b>'; + $replacements[2] = '<font color="#ff0000">' . gettext("Warning") . '</font>'; ksort($patterns); ksort($replacements); return preg_replace($patterns, $replacements, $string); @@ -110,7 +110,7 @@ switch($action) <form action="smartmon.php" method="post" name="abort"> <input type="hidden" name="device" value="' . $_POST['device'] . '" /> <input type="hidden" name="action" value="abort" /> - <input type="submit" name="submit" value="Abort" /> + <input type="submit" name="submit" value="' . gettext("Abort") . '" /> </form> </pre>'; break; @@ -151,7 +151,7 @@ switch($action) if($_POST['testemail']) { // FIXME shell_exec($smartd . " -M test -m " . $config['system']['smartmonemail']); - $savemsg = "Email sent to " . $config['system']['smartmonemail']; + $savemsg = sprintf(gettext("Email sent to %s"), $config['system']['smartmonemail']); smartmonctl("stop"); smartmonctl("start"); } @@ -191,8 +191,8 @@ switch($action) <td> <?php $tab_array = array(); - $tab_array[0] = array("Information/Tests", false, $_SERVER['PHP_SELF'] . "?action=default"); - $tab_array[1] = array("Config", true, $_SERVER['PHP_SELF'] . "?action=config"); + $tab_array[0] = array(gettext("Information/Tests"), false, $_SERVER['PHP_SELF'] . "?action=default"); + $tab_array[1] = array(gettext("Config"), true, $_SERVER['PHP_SELF'] . "?action=config"); display_top_tabs($tab_array); ?> </td> @@ -203,10 +203,11 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">Config</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Config"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Email Address</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Email Address"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("Email Adress"); ?></td> <td width="78%" class="vtable"> <input type="text" name="smartmonemail" value="<?=$pconfig['smartmonemail']?>"/> </td> @@ -216,7 +217,7 @@ switch($action) <td width="78%"> <input type="hidden" name="action" value="config" /> <input type="hidden" name="email" value="true" /> - <input type="submit" name="submit" value="Save" class="formbtn" /> + <input type="submit" name="submit" value="<?=gettext("Save"); ?>" class="formbtn" /> </td> </tr> </tbody> @@ -228,12 +229,12 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">Test email</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Test email"); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"> </td> <td width="78%" class="vtable"> - Send test email to <?=$config['system']['smartmonemail']?> + <?php printf(gettext("Send test email to %s"), $config['system']['smartmonemail']); ?> </td> </tr> <tr> @@ -241,7 +242,7 @@ switch($action) <td width="78%"> <input type="hidden" name="action" value="config" /> <input type="hidden" name="testemail" value="true" /> - <input type="submit" name="submit" value="Send" class="formbtn" /> + <input type="submit" name="submit" value="<?=gettext("Send"); ?>" class="formbtn" /> </td> </tr> </tbody> @@ -263,7 +264,7 @@ switch($action) <td> <?php $tab_array = array(); - $tab_array[0] = array("Information/Tests", true, $_SERVER['PHP_SELF']); + $tab_array[0] = array(gettext("Information/Tests"), true, $_SERVER['PHP_SELF']); //$tab_array[1] = array("Config", false, $_SERVER['PHP_SELF'] . "?action=config"); display_top_tabs($tab_array); ?> @@ -275,20 +276,20 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">Info</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Info"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Info type</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Info type"); ?></td> <td width="78%" class="vtable"> - <input type="radio" name="type" value="i" />Info<br /> - <input type="radio" name="type" value="H" checked />Health<br /> - <input type="radio" name="type" value="c" />SMART Capabilities<br /> - <input type="radio" name="type" value="A" />Attributes<br /> - <input type="radio" name="type" value="a" />All<br /> + <input type="radio" name="type" value="i" /><?=gettext("Info"); ?><br /> + <input type="radio" name="type" value="H" checked /><?=gettext("Health"); ?><br /> + <input type="radio" name="type" value="c" /><?=gettext("SMART Capabilities"); ?><br /> + <input type="radio" name="type" value="A" /><?=gettext("Attributes"); ?><br /> + <input type="radio" name="type" value="a" /><?=gettext("All"); ?><br /> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Device: /dev/</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Device: /dev/"); ?></td> <td width="78%" class="vtable"> <select name="device"> <?php @@ -304,7 +305,7 @@ switch($action) <td width="22%" valign="top"> </td> <td width="78%"> <input type="hidden" name="action" value="info" /> - <input type="submit" name="submit" value="View" class="formbtn" /> + <input type="submit" name="submit" value="<?=gettext("View"); ?>" class="formbtn" /> </td> </tr> </tbody> @@ -315,19 +316,19 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">Perform Self Tests</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Perform Self Tests"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Test type</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Test type"); ?></td> <td width="78%" class="vtable"> - <input type="radio" name="testType" value="offline" />Offline<br /> - <input type="radio" name="testType" value="short" checked />Short<br /> - <input type="radio" name="testType" value="long" />Long<br /> - <input type="radio" name="testType" value="conveyance" />Conveyance (ATA Disks Only)<br /> + <input type="radio" name="testType" value="offline" /><?=gettext("Offline"); ?><br /> + <input type="radio" name="testType" value="short" checked /><?=gettext("Short"); ?><br /> + <input type="radio" name="testType" value="long" /><?=gettext("Long"); ?><br /> + <input type="radio" name="testType" value="conveyance" /><?=gettext("Conveyance (ATA Disks Only)"); ?><br /> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Device: /dev/</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Device: /dev/"); ?></td> <td width="78%" class="vtable"> <select name="device"> <?php @@ -343,7 +344,7 @@ switch($action) <td width="22%" valign="top"> </td> <td width="78%"> <input type="hidden" name="action" value="test" /> - <input type="submit" name="submit" value="Test" class="formbtn" /> + <input type="submit" name="submit" value="<?=gettext("Test"); ?>" class="formbtn" /> </td> </tr> </tbody> @@ -354,17 +355,17 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">View Logs</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("View Logs"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Log type</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Log type"); ?></td> <td width="78%" class="vtable"> - <input type="radio" name="type" value="error" checked />Error<br /> - <input type="radio" name="type" value="selftest" />Self Test<br /> + <input type="radio" name="type" value="error" checked /><?=gettext("Error"); ?><br /> + <input type="radio" name="type" value="selftest" /><?=gettext("Self Test"); ?><br /> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Device: /dev/</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Device: /dev/"); ?></td> <td width="78%" class="vtable"> <select name="device"> <?php @@ -380,7 +381,7 @@ switch($action) <td width="22%" valign="top"> </td> <td width="78%"> <input type="hidden" name="action" value="logs" /> - <input type="submit" name="submit" value="View" class="formbtn" /> + <input type="submit" name="submit" value="<?=gettext("View"); ?>" class="formbtn" /> </td> </tr> </tbody> @@ -391,10 +392,10 @@ switch($action) <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tbody> <tr> - <td colspan="2" valign="top" class="listtopic">Abort tests</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Abort tests"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Device: /dev/</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Device: /dev/"); ?></td> <td width="78%" class="vtable"> <select name="device"> <?php @@ -410,7 +411,7 @@ switch($action) <td width="22%" valign="top"> </td> <td width="78%"> <input type="hidden" name="action" value="abort" /> - <input type="submit" name="submit" value="Abort" class="formbtn" onclick="return confirm('Do you really want to abort the test?')" /> + <input type="submit" name="submit" value="<?=gettext("Abort"); ?>" class="formbtn" onclick="return confirm('<?=gettext("Do you really want to abort the test?"); ?>')" /> </td> </tr> </tbody> @@ -425,7 +426,7 @@ switch($action) // print back button on pages if(isset($_POST['submit']) && $_POST['submit'] != "Save") { - echo '<br /><a href="' . $_SERVER['PHP_SELF'] . '">Back</a>'; + echo '<br /><a href="' . $_SERVER['PHP_SELF'] . '">' . gettext("Back") . '</a>'; } ?> <br /> @@ -433,4 +434,4 @@ if(isset($_POST['submit']) && $_POST['submit'] != "Save") <?php include("fend.inc"); ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index cb0807a..fa49563 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -153,7 +153,7 @@ function print_summary_table($label, $iparr, $sort = TRUE) { ?> </table> -<? +<?php } $pgtitle = array(gettext("Diagnostics"),gettext("State Table Summary")); diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index 4818534..2c930de 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -96,7 +96,7 @@ else print_input_errors($input_errors); ?> <form method="post"> - <?=gettext("Sort type"); ?>: + <?=gettext("Sort type:"); ?> <select name='sorttype' id='sorttype' onChange='this.form.submit();'> <option value='<?=$sorttype?>'><?=$sorttype?></option> <option value='age'><?=gettext("age");?></option> diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 9a949a2..009b2ac 100755 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -114,10 +114,10 @@ if (!isset($do_traceroute)) { </tr> <tr> <td valign="top" colspan="2"> - <p><span class="vexpl"><span class="red"><b><?=gettext("Note");?>:</b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p> + <p><span class="vexpl"><span class="red"><b><?=gettext("Note:");?></b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p> <? if ($do_traceroute) { echo "<font face='terminal' size='2'>"; - echo("<br><strong>Traceroute output:</strong><br>"); + echo("<br><strong>" . gettext("Traceroute output:") . "</strong><br>"); echo('<pre>'); ob_end_flush(); if($_REQUEST['useicmp']) @@ -133,7 +133,7 @@ if (!isset($do_traceroute)) { <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <span class="vexpl"><b><?=gettext("Note");?>:</b></span><?=gettext("Multi-wan is not supported from this utility currently.");?> + <span class="vexpl"><b><?=gettext("Note:");?></b></span><?=gettext("Multi-wan is not supported from this utility currently.");?> </td> </tr> </table> diff --git a/usr/local/www/easyrule.php b/usr/local/www/easyrule.php index 85e20a3..5f7a4ec 100644 --- a/usr/local/www/easyrule.php +++ b/usr/local/www/easyrule.php @@ -58,7 +58,7 @@ if(stristr($retval, "error") == true) include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> -<? include("fbegin.inc"); ?> +<?php include("fbegin.inc"); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> @@ -68,13 +68,13 @@ include("head.inc"); ?> <br/> <?=gettext("Message"); ?>: <?php echo $message; ?> <br/> -<? } else { ?> +<?php } else { ?> <?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " . "If you are seeing this, there apparently was not an error, and you navigated to the " . "page directly without telling it what to do"); ?>.<br/><br/> <?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="diag_logs_filter.php"><?=gettext("Status"); ?> > <?=gettext("System Logs, " . "Firewall Tab"); ?></a>. <br /> -<? } ?> +<?php } ?> </td></tr></table> <?php include("fend.inc"); ?> diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 33e765a..84efb8e 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -241,7 +241,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="3"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br></strong></span><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br></strong></span><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p> </td> </tr> </table> diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 96f0819..494d34e 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -157,8 +157,8 @@ include("head.inc"); </tr> <tr> <td colspan="4"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br> - </strong></span><?=gettext("Depending on the way your WAN connection is setup, you may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>.<br/> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br> + </strong></span><?=gettext("Depending on the way your WAN connection is setup, you may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a><br/> <?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, it will make this system inaccessible on that IP address. i.e. if " . "you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) using the WAN IP address will no longer function."); ?></span></p> </td> diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 07d8bac..ceded3d 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -501,7 +501,7 @@ include("fbegin.inc"); ?> <?php endforeach; ?> </select> <br> <span class="vexpl"><?=gettext("Choose which IP protocol " . "this rule should match."); ?><br> - <?=gettext("Hint: in most cases, you should specify"); ?> <em>TCP</em> <?=gettext("here"); ?>.</span></td> + <?=gettext("Hint: in most cases, you should specify"); ?> <em><?=gettext("TCP"); ?></em> <?=gettext("here."); ?></span></td> </tr> <tr id="showadvancedboxsrc" name="showadvancedboxsrc"> <td width="22%" valign="top" class="vncellreq"><?=gettext("Source"); ?></td> @@ -515,12 +515,12 @@ include("fbegin.inc"); ?> <input name="srcnot" type="checkbox" id="srcnot" value="yes" <?php if ($pconfig['srcnot']) echo "checked"; ?>> <strong><?=gettext("not"); ?></strong> <br /> - <?=gettext("Use this option to invert the sense of the match"); ?>. + <?=gettext("Use this option to invert the sense of the match."); ?> <br /> <br /> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Type"); ?>: </td> + <td><?=gettext("Type:"); ?> </td> <td> <select name="srctype" class="formselect" onChange="typesel_change()"> <?php @@ -550,7 +550,7 @@ include("fbegin.inc"); ?> </td> </tr> <tr> - <td><?=gettext("Address"); ?>: </td> + <td><?=gettext("Address:"); ?> </td> <td> <input autocomplete='off' name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>"> / <select name="srcmask" class="formselect" id="srcmask"> @@ -568,7 +568,7 @@ include("fbegin.inc"); ?> <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("from"); ?>: </td> + <td><?=gettext("from:"); ?> </td> <td> <select name="srcbeginport" class="formselect" onchange="src_rep_change();ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -581,7 +581,7 @@ include("fbegin.inc"); ?> </td> </tr> <tr> - <td><?=gettext("to"); ?>:</td> + <td><?=gettext("to:"); ?></td> <td> <select name="srcendport" class="formselect" onchange="ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -604,12 +604,12 @@ include("fbegin.inc"); ?> <input name="dstnot" type="checkbox" id="dstnot" value="yes" <?php if ($pconfig['dstnot']) echo "checked"; ?>> <strong><?=gettext("not"); ?></strong> <br /> - <?=gettext("Use this option to invert the sense of the match"); ?>. + <?=gettext("Use this option to invert the sense of the match."); ?> <br /> <br /> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Type"); ?>: </td> + <td><?=gettext("Type:"); ?> </td> <td> <select name="dsttype" class="formselect" onChange="typesel_change()"> <?php @@ -658,7 +658,7 @@ include("fbegin.inc"); ?> </td> </tr> <tr> - <td><?=gettext("Address"); ?>: </td> + <td><?=gettext("Address:"); ?> </td> <td> <input name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>"> / @@ -678,7 +678,7 @@ include("fbegin.inc"); ?> <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("from"); ?>: </td> + <td><?=gettext("from:"); ?> </td> <td> <select name="dstbeginport" class="formselect" onchange="dst_rep_change();ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -691,7 +691,7 @@ include("fbegin.inc"); ?> </td> </tr> <tr> - <td><?=gettext("to"); ?>:</td> + <td><?=gettext("to:"); ?></td> <td> <select name="dstendport" class="formselect" onchange="ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -706,7 +706,7 @@ include("fbegin.inc"); ?> </table> <br /> <span class="vexpl"> - <?=gettext("Specify the port or port range for the destination of the packet for this mapping"); ?>. + <?=gettext("Specify the port or port range for the destination of the packet for this mapping."); ?> <br /> <?=gettext("Hint: you can leave the"); ?> <em>'<?=gettext("to"); ?>'</em> <?=gettext("field empty if you only want to map a single port"); ?> </span> @@ -717,7 +717,7 @@ include("fbegin.inc"); ?> <td width="78%" class="vtable"> <input autocomplete='off' name="localip" type="text" class="formfldalias" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"> <br> <span class="vexpl"><?=gettext("Enter the internal IP address of " . - "the server on which you want to map the ports"); ?>.<br> + "the server on which you want to map the ports."); ?><br> <?=gettext("e.g."); ?> <em>192.168.1.12</em></span></td> </tr> <tr name="lprtr" id="lprtr"> @@ -738,7 +738,7 @@ include("fbegin.inc"); ?> <span class="vexpl"><?=gettext("Specify the port on the machine with the " . "IP address entered above. In case of a port range, specify " . "the beginning port of the range (the end port will be calculated " . - "automatically)"); ?>.<br> + "automatically)."); ?><br> <?=gettext("Hint: this is usually identical to the 'from' port above"); ?></span></td> </tr> <tr> @@ -746,7 +746,7 @@ include("fbegin.inc"); ?> <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> <br> <span class="vexpl"><?=gettext("You may enter a description here " . - "for your reference (not parsed)"); ?>.</span></td> + "for your reference (not parsed)."); ?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync"); ?></td> @@ -771,7 +771,7 @@ include("fbegin.inc"); ?> <td width="78%" class="vtable"> <select name="associated-rule-id"> <option value=""><?=gettext("None"); ?></option> - <option value="pass" <?php if($pconfig['associated-rule-id'] == "pass") echo " SELECTED"; ?>>Pass</option> + <option value="pass" <?php if($pconfig['associated-rule-id'] == "pass") echo " SELECTED"; ?>><?=gettext("Pass"); ?></option> <?php $linkedrule = ""; if (is_array($config['filter']['rule'])) { diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index ae72e07..fb59a60 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -287,7 +287,7 @@ include("head.inc"); <?php $tab_array = array(); $tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php"); - $tab_array[] = array("1:1", false, "firewall_nat_1to1.php"); + $tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php"); $tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php"); display_top_tabs($tab_array); ?> @@ -296,7 +296,7 @@ include("head.inc"); <td> <div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr><td align="right"><b><?=gettext("Mode"); ?>:</b></td> + <tr><td align="right"><b><?=gettext("Mode:"); ?></b></td> <td> <input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>> <strong><?=gettext("Automatic outbound NAT rule generation"); ?><br/> <?=gettext("(IPsec passthrough included)");?></strong> @@ -322,7 +322,7 @@ include("head.inc"); </tr> </table> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr><td colspan="5"><b> <?=gettext("Mappings"); ?>:</b></td></tr> + <tr><td colspan="5"><b> <?=gettext("Mappings:"); ?></b></td></tr> <tr><td> </td></tr> <tr id="frheader"> <td width="3%" class="list"> </td> @@ -441,14 +441,14 @@ include("head.inc"); </tr> <tr> <td colspan="12"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br> </strong></span><?=gettext("If advanced outbound NAT is enabled, no outbound NAT " . "rules will be automatically generated any longer. Instead, only the mappings " . "you specify below will be used. With advanced outbound NAT disabled, " . "a mapping is automatically created for each interface's subnet " . "(except WAN). If you use target addresses other than the WAN interface's " . "IP address, then depending on the way your WAN connection is setup, you " . - "may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>.</span><br> + "may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a></span><br> </td> </tr> diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index 01af830..6b41ceb 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -370,14 +370,14 @@ function sourcesel_change() { <td width="78%" class="vtable"> <table border="0" cellspacing="1" cellpadding="1"> <tr> - <td><?=gettext("Type");?>: </td> + <td><?=gettext("Type:");?> </td> <td> <select name="source_type" class="formselect" onChange="sourcesel_change()"> <option value="any" <?php if ($pconfig['source'] == "any") echo "selected"; ?>><?=gettext("any");?></option> <option value="network" <?php if ($pconfig['source'] != "any") echo "selected"; ?>><?=gettext("Network");?></option> </select> </td></tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td><input name="source" type="text" class="formfld unknown" id="source" size="20" value="<?=htmlspecialchars($pconfig['source']);?>">/<select name="source_subnet" class="formfld" id="source_subnet"> <?php for ($i = 32; $i >= 0; $i--): ?> <option value="<?=$i;?>"<?php if ($i == $pconfig['source_subnet']) echo " selected"; ?>><?=$i;?></option> @@ -389,7 +389,7 @@ function sourcesel_change() { <td><span class="vexpl"><?=gettext("Enter the source network for the outbound NAT mapping.");?></span></td> </tr> <tr> - <td><?=gettext("Source port");?>: </td> + <td><?=gettext("Source port:");?> </td> <td><input name="sourceport" type="text" class="formfld unknown" id="sourceport" size="5" value="<?=htmlspecialchars($pconfig['sourceport']);?>"> <?=gettext("(leave blank for any)");?></td> </tr> @@ -404,7 +404,7 @@ blank for any)");?></td> <br> <table border="0" cellspacing="1" cellpadding="1"> <tr> - <td><?=gettext("Type");?>: </td> + <td><?=gettext("Type:");?> </td> <td><select name="destination_type" class="formselect" onChange="typesel_change()"> <option value="any"<?php if ($pconfig['destination'] == "any") echo " selected"; ?>> <?=gettext("any");?></option> @@ -413,7 +413,7 @@ blank for any)");?></td> </select></td> </tr> <tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td><input name="destination" type="text" class="formfld unknown" id="destination" size="20" value="<?=htmlspecialchars($pconfig['destination']);?>"> / <select name="destination_subnet" class="formselect" id="destination_subnet"> @@ -428,7 +428,7 @@ blank for any)");?></td> "the outbound NAT mapping.");?></span></td> </tr> <tr> - <td><?=gettext("Destination port");?>: </td> + <td><?=gettext("Destination port:");?> </td> <td><input name="dstport" type="text" class="formfld unknown" id="dstport" size="5" value="<?=htmlspecialchars($pconfig['dstport']);?>"> <?=gettext("(leave blank for any)");?></td> </tr> @@ -440,7 +440,7 @@ any)");?></td> <td width="78%" class="vtable"> <table border="0" cellspacing="1" cellpadding="1"> <tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td><select name="target" class="formselect"> <option value=""<?php if (!$pconfig['target']) echo " selected"; ?>><?=gettext("Interface address");?></option> <?php if (is_array($config['virtualip']['vip'])): @@ -472,14 +472,14 @@ any)");?></td> </span> </td></tr> <tr> - <td><?=gettext("Port");?>: </td> + <td><?=gettext("Port:");?> </td> <td><input name="natport" type="text" class="formfld unknown" id="natport" size="5" value="<?=htmlspecialchars($pconfig['natport']);?>"></td> </tr> <tr><td> </td><td> <span class="vexpl"><?=gettext("Enter the source port for the outbound NAT mapping.");?></span> </td></tr> <tr> - <td><?=gettext("Static-port");?>: </td> + <td><?=gettext("Static-port:");?> </td> <td><input onChange="staticportchange();" name="staticnatport" type="checkbox" class="formfld" id="staticnatport" size="5"<?php if($pconfig['staticnatport']) echo " CHECKED";?>></td> </tr> </table> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 472f100..3a769b7 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -758,7 +758,7 @@ if($_REQUEST['undodrag']) { <td colspan="10"> <p/> <strong> - <span class="red"><?=gettext("Hint") . ":";?></span> + <span class="red"><?=gettext("Hint:");?></span> </strong><br> <ul> <li><?=gettext("Rules are evaluated on a first-match basis (i.e. " . diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index f132ea9..95e844d 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -624,7 +624,7 @@ include("head.inc"); <span class="vexpl"><?=gettext("Set this option if you need to apply this action to traffic that matches this rule immediately.");?></span> </td> </tr> -<? endif; ?> +<?php endif; ?> <?php $edit_disabled = ""; ?> <?php if( isset($pconfig['associated-rule-id']) ): ?> <tr> @@ -658,7 +658,7 @@ include("head.inc"); <td width="78%" class="vtable"> <?php if ($if == "FloatingRules" || isset($pconfig['floating'])): ?> <select name="interface[]" multiple="true" class="formselect" size="3" <?=$edit_disabled;?>> -<? else: ?> +<?php else: ?> <select name="interface" class="formselect" <?=$edit_disabled;?>> <?php endif; @@ -775,7 +775,7 @@ include("head.inc"); <br /> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Type");?>: </td> + <td><?=gettext("Type:");?> </td> <td> <select <?=$edit_disabled;?> name="srctype" class="formselect" onChange="typesel_change()"> <?php @@ -805,7 +805,7 @@ include("head.inc"); </td> </tr> <tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td> <input <?=$edit_disabled;?> autocomplete='off' name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>"> / <select <?=$edit_disabled;?> name="srcmask" class="formselect" id="srcmask"> @@ -827,7 +827,7 @@ include("head.inc"); <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("from");?>: </td> + <td><?=gettext("from:");?> </td> <td> <select <?=$edit_disabled;?> name="srcbeginport" class="formselect" onchange="src_rep_change();ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -840,7 +840,7 @@ include("head.inc"); </td> </tr> <tr> - <td><?=gettext("to");?>:</td> + <td><?=gettext("to:");?></td> <td> <select <?=$edit_disabled;?> name="srcendport" class="formselect" onchange="ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -868,7 +868,7 @@ include("head.inc"); <br /> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Type");?>: </td> + <td><?=gettext("Type:");?> </td> <td> <select <?=$edit_disabled;?> name="dsttype" class="formselect" onChange="typesel_change()"> <?php @@ -898,7 +898,7 @@ include("head.inc"); </td> </tr> <tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td> <input <?=$edit_disabled;?> name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>"> / @@ -918,7 +918,7 @@ include("head.inc"); <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("from");?>: </td> + <td><?=gettext("from:");?> </td> <td> <select <?=$edit_disabled;?> name="dstbeginport" class="formselect" onchange="dst_rep_change();ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -931,7 +931,7 @@ include("head.inc"); </td> </tr> <tr> - <td><?=gettext("to");?>:</td> + <td><?=gettext("to:");?></td> <td> <select <?=$edit_disabled;?> name="dstendport" class="formselect" onchange="ext_change()"> <option value="">(<?=gettext("other"); ?>)</option> @@ -989,11 +989,11 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Source OS");?></td> <td width="78%" class="vtable"> - <div id="showadvsourceosbox" <? if ($pconfig['os']) echo "style='display:none'"; ?>> + <div id="showadvsourceosbox" <?php if ($pconfig['os']) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_sourceos()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showsourceosadv" <? if (empty($pconfig['os'])) echo "style='display:none'"; ?>> - <?=gettext("OS Type");?>: + <div id="showsourceosadv" <?php if (empty($pconfig['os'])) echo "style='display:none'"; ?>> + <?=gettext("OS Type:");?> <select name="os" id="os" class="formselect"> <?php $ostypes = array( @@ -1023,10 +1023,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Diffserv Code Point");?></td> <td width="78%" class="vtable"> - <div id="dsadv" name="dsadv" <? if ($pconfig['dscp']) echo "style='display:none'"; ?>> + <div id="dsadv" name="dsadv" <?php if ($pconfig['dscp']) echo "style='display:none'"; ?>> <input type="button" onClick="show_dsdiv();" value="<?=gettext("Advanced"); ?>"> - <?=gettext("Show advanced option");?> </div> - <div id="dsdivmain" name="dsdivmain" <? if (empty($pconfig['dscp'])) echo "style='display:none'"; ?>> + <div id="dsdivmain" name="dsdivmain" <?php if (empty($pconfig['dscp'])) echo "style='display:none'"; ?>> <select name="dscp" id="dscp"> <option value=""></option> <?php foreach($firewall_rules_dscp_types as $frdt): ?> @@ -1081,10 +1081,10 @@ include("head.inc"); <tr id="tcpflags" name="tcpflags"> <td width="22%" valign="top" class="vncell"><?=gettext("TCP flags");?></td> <td width="78%" class="vtable"> - <div id="showtcpflagsbox" <? if ($pconfig['tcpflags_any'] || $pconfig['tcpflags1'] || $pconfig['tcpflags2']) echo "style='display:none'"; ?>> + <div id="showtcpflagsbox" <?php if ($pconfig['tcpflags_any'] || $pconfig['tcpflags1'] || $pconfig['tcpflags2']) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_tcpflags()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showtcpflagsadv" <? if (empty($pconfig['tcpflags_any']) && empty($pconfig['tcpflags1']) && empty($pconfig['tcpflags2'])) echo "style='display:none'"; ?>> + <div id="showtcpflagsadv" <?php if (empty($pconfig['tcpflags_any']) && empty($pconfig['tcpflags1']) && empty($pconfig['tcpflags2'])) echo "style='display:none'"; ?>> <div id="tcpheader" name="tcpheader"> <center> <table border="0" cellspacing="0" cellpadding="0"> @@ -1123,10 +1123,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("State Type");?></td> <td width="78%" class="vtable"> - <div id="showadvstatebox" <? if (!empty($pconfig['statetype']) && $pconfig['statetype'] != "keep state") echo "style='display:none'"; ?>> + <div id="showadvstatebox" <?php if (!empty($pconfig['statetype']) && $pconfig['statetype'] != "keep state") echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_state()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showstateadv" <? if (empty($pconfig['statetype']) || $pconfig['statetype'] == "keep state") echo "style='display:none'"; ?>> + <div id="showstateadv" <?php if (empty($pconfig['statetype']) || $pconfig['statetype'] == "keep state") echo "style='display:none'"; ?>> <select name="statetype"> <option value="keep state" <?php if(!isset($pconfig['statetype']) or $pconfig['statetype'] == "keep state") echo "selected"; ?>><?=gettext("keep state");?></option> <option value="sloppy state" <?php if($pconfig['statetype'] == "sloppy state") echo "selected"; ?>><?=gettext("sloppy state");?></option> @@ -1147,10 +1147,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync");?></td> <td width="78%" class="vtable"> - <div id="showadvnoxmlrpcsyncbox" <? if ($pconfig['nosync']) echo "style='display:none'"; ?>> + <div id="showadvnoxmlrpcsyncbox" <?php if ($pconfig['nosync']) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_noxmlrpc()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="shownoxmlrpcadv" <? if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>> + <div id="shownoxmlrpcadv" <?php if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>> <input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br> <?=gettext("HINT: This prevents the rule from automatically syncing to other CARP members.");?> </div> @@ -1170,10 +1170,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Schedule");?></td> <td width="78%" class="vtable"> - <div id="showadvschedulebox" <? if (!empty($pconfig['sched'])) echo "style='display:none'"; ?>> + <div id="showadvschedulebox" <?php if (!empty($pconfig['sched'])) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_schedule()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showscheduleadv" <? if (empty($pconfig['sched'])) echo "style='display:none'"; ?>> + <div id="showscheduleadv" <?php if (empty($pconfig['sched'])) echo "style='display:none'"; ?>> <select name='sched'> <?php foreach($schedules as $schedule) { @@ -1197,10 +1197,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td> <td width="78%" class="vtable"> - <div id="showadvgatewaybox" <? if (!empty($pconfig['gateway'])) echo "style='display:none'"; ?>> + <div id="showadvgatewaybox" <?php if (!empty($pconfig['gateway'])) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_gateway()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showgatewayadv" <? if (empty($pconfig['gateway'])) echo "style='display:none'"; ?>> + <div id="showgatewayadv" <?php if (empty($pconfig['gateway'])) echo "style='display:none'"; ?>> <select name='gateway'> <option value="" ><?=gettext("default");?></option> <?php @@ -1238,10 +1238,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("In/Out");?></td> <td width="78%" class="vtable"> - <div id="showadvinoutbox" <? if (!empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>> + <div id="showadvinoutbox" <?php if (!empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_inout()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showinoutadv" <? if (empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>> + <div id="showinoutadv" <?php if (empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>> <select name="dnpipe"> <?php if (!is_array($dnqlist)) @@ -1288,10 +1288,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Ackqueue/Queue");?></td> <td width="78%" class="vtable"> - <div id="showadvackqueuebox" <? if (!empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>> + <div id="showadvackqueuebox" <?php if (!empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_ackqueue()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showackqueueadv" <? if (empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>> + <div id="showackqueueadv" <?php if (empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>> <select name="ackqueue"> <?php if (!is_array($qlist)) @@ -1336,10 +1336,10 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Layer7");?></td> <td width="78%" class="vtable"> - <div id="showadvlayer7box" <? if (!empty($pconfig['l7container'])) echo "style='display:none'"; ?>> + <div id="showadvlayer7box" <?php if (!empty($pconfig['l7container'])) echo "style='display:none'"; ?>> <input type="button" onClick="show_advanced_layer7()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a> </div> - <div id="showlayer7adv" <? if (empty($pconfig['l7container'])) echo "style='display:none'"; ?>> + <div id="showlayer7adv" <?php if (empty($pconfig['l7container'])) echo "style='display:none'"; ?>> <select name="l7container"> <?php if (!is_array($l7clist)) diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php index cfa160b..28dc5c9 100644 --- a/usr/local/www/firewall_schedule.php +++ b/usr/local/www/firewall_schedule.php @@ -108,7 +108,8 @@ include("head.inc"); <?php $i = 0; foreach ($a_schedules as $schedule): ?> <tr> <td class="listlr" ondblclick="document.location='firewall_schedule_edit.php?id=<?=$i;?>';"> - <?=htmlspecialchars($schedule['name']); + <?=htmlspecialchars($schedule['name']);?> + <?php $schedstatus = filter_get_time_based_rule_status($schedule); if ($schedstatus) { ?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_frmfld_time.png" title="<?=gettext("Schedule is currently active");?>" width="17" height="17" border="0"> @@ -206,7 +207,7 @@ include("head.inc"); $timeFriendly = $starttime . "-" . $stoptime; $description = $timerange['rangedescr']; - ?><tr><td><?echo $dayFriendly;?></td><td><?echo $timeFriendly;?></td><td><?echo $description;?></td><tr/><?php + ?><tr><td><?=$dayFriendly;?></td><td><?=$timeFriendly;?></td><td><?=$description;?></td><tr/><?php } }//end for?></table> </td> @@ -236,7 +237,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="3"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p> </td> </tr> </table> diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 26954c2..7de18d1 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -426,7 +426,7 @@ include("fbegin.inc"); <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn"> </a> </td><td width="75%"> </td></tr> -<? endif; ?> +<?php endif; ?> <tr> <td width="25%" valign="top" algin="left"> <?php diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php index d331c14..a73506d 100755 --- a/usr/local/www/firewall_shaper_layer7.php +++ b/usr/local/www/firewall_shaper_layer7.php @@ -71,13 +71,13 @@ read_layer7_config(); if($_GET['reset'] <> "") { // kill all ipfw-classifyd processes - mwexec("killall -9 ipfw-classifyd"); + mwexec("killall -9 ipfw-classifyd"); exit; } if ($_GET) { if ($_GET['container']) - $name = trim($_GET['container']); + $name = trim($_GET['container']); if ($_GET['action']) $action = $_GET['action']; } @@ -124,7 +124,7 @@ if ($_GET) { else if ($_POST) { $show_proto_form = true; unset($input_errors); - + if($_POST['submit']) { if (isset($layer7_rules_list[$name])) { $l7r = $layer7_rules_list[$name]; @@ -199,7 +199,7 @@ else if ($_POST) { write_config(); mark_subsystem_dirty('shaper'); unset($container); - + header("Location: firewall_shaper_layer7.php"); exit; } @@ -230,7 +230,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> - + <script language="javascript"> var initial_count = new Array(); @@ -248,24 +248,24 @@ js_behaviours_limiter = array_limiter(js_behaviours_limiter); function array_altq(a_behav) { var index; - <? if (!empty($avail_behaviours_altq)) { + <?php if (!empty($avail_behaviours_altq)) { foreach ($avail_behaviours_altq as $key => $queue) { ?> name = "<?= $queue; ?>"; - index = <? echo $key; ?>; + index = <?= $key; ?>; a_behav[index] = name; - <? } + <?php } } ?> return a_behav; } function array_limiter(a_behav) { var index; - <? if (!empty($avail_behaviours_limiter)) { + <?php if (!empty($avail_behaviours_limiter)) { foreach ($avail_behaviours_limiter as $key => $limiter) { ?> name = "<?= $limiter; ?>"; - index = <? echo $key; ?>; + index = <?= $key; ?>; a_behav[index] = name; - <? } + <?php } } ?> return a_behav; } @@ -275,19 +275,19 @@ function fillProtocol() { var protocol = '<select name="protocol[]" id="protocol" style="font-size:8pt">'; var name; - <? foreach ($avail_protos as $key => $proto) { ?> + <?php foreach ($avail_protos as $key => $proto) { ?> name = "<?= $proto; ?>"; protocol += "<option value=" + name + ">" + name + "</option>"; - <? } ?> + <?php } ?> protocol += "</select>"; - + return protocol; } function fillStructure() { var structure = '<select name="structure[]" id="structure" style="font-size:8pt" onchange="changeBehaviourValues(this.parentNode.parentNode);">'; var name; - <? foreach ($avail_structures as $key => $struct) { ?> + <?php foreach ($avail_structures as $key => $struct) { ?> name = "<?= $struct; ?>"; if(name == "queue") { if(js_behaviours_altq != "") { structure += "<option value=" + name + ">" + name + "</option>";} @@ -296,54 +296,54 @@ function fillStructure() { if(name == "limiter") { if(js_behaviours_limiter != "") { structure += "<option value=" + name + ">" + name + "</option>";} } - else structure += "<option value=" + name + ">" + name + "</option>"; //action - } - <? } ?> + else structure += "<option value=" + name + ">" + name + "</option>"; //action + } + <?php } ?> structure += "</select>"; - + return structure; } - + //Used by default to fill the values when inserting a new row. function fillBehaviour() { var behaviour = '<select name="behaviour[]" id="behaviour" style="width:80px; font-size:8pt">'; var name; - <? foreach ($avail_behaviours_action as $key => $behav) { ?> + <?php foreach ($avail_behaviours_action as $key => $behav) { ?> name = "<?= $behav; ?>"; behaviour += "<option value=" + name + ">" + name + "</option>"; - <? } ?> + <?php } ?> behaviour += "</select>"; - + return behaviour; } /* Change the values on behaviours select when changing the structure row */ function changeBehaviourValues(row) { var selectedRow = row.rowIndex - 2; //because row.rowIndex returns 2, not 0 - var structureSelected = document.getElementsByName("structure[]")[selectedRow].value; - + var structureSelected = document.getElementsByName("structure[]")[selectedRow].value; + //Select the behaviours values to array a_behav - var a_behav = new Array(); + var a_behav = new Array(); if (structureSelected == "action") { a_behav = js_behaviours_action; //static } else { - if (structureSelected == "queue") { + if (structureSelected == "queue") { a_behav = js_behaviours_altq; } - else { + else { a_behav = js_behaviours_limiter; - } - } - + } + } + //Build the html statement with the array values previously selected var new_behav; var name; for(i=0; i<a_behav.length; i++) { - new_behav += "<option value=" + a_behav[i] + ">" + a_behav[i] + "</option>"; + new_behav += "<option value=" + a_behav[i] + ">" + a_behav[i] + "</option>"; } - - document.getElementsByName("behaviour[]")[selectedRow].innerHTML = new_behav; + + document.getElementsByName("behaviour[]")[selectedRow].innerHTML = new_behav; } /* Add row to the table */ @@ -358,9 +358,9 @@ function addRow(table_id) { // determining real count of added fields var tFielsNum = rows_count - initial_count[table_id]; if (rows_limit!=0 && tFielsNum >= rows_limit) return false; - - var remove = '<input type = "image" src = "/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(\''+table_id+'\',this.parentNode.parentNode)" value = "Delete" />'; - + + var remove = '<input type = "image" src = "/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(\''+table_id+'\',this.parentNode.parentNode)" value = "Delete" />'; + try { var newRow = tbl.insertRow(rows_count); var newCell = newRow.insertCell(0); @@ -371,11 +371,11 @@ function addRow(table_id) { newCell.innerHTML = fillBehaviour(); var newCell = newRow.insertCell(3); newCell.innerHTML = remove; - } + } catch (ex) { //if exception occurs alert(ex); - } + } } /* Remove row from the table */ @@ -390,7 +390,7 @@ function removeRow(tbl,row) { </script> <?php -include("fbegin.inc"); +include("fbegin.inc"); ?> <div id="inputerrors"></div> <?php if ($input_errors) print_input_errors($input_errors); ?> @@ -417,16 +417,16 @@ include("fbegin.inc"); <td> <div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - + <?php if (count($layer7_rules_list) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> </td><td width="75%"> </td></tr> - - <? endif; ?> + + <?php endif; ?> <tr> <td width="25%" valign="top" algin="left"> <?php - echo $tree; + echo $tree; ?> <br/><br/> <a href="firewall_shaper_layer7.php?action=add"> @@ -438,7 +438,7 @@ include("fbegin.inc"); <? echo $output; ?> - + <!-- Layer 7 rules form --> <?php if($show_proto_form): ?> <td width = "22%" valign = "top" class = "vncellreq"> @@ -450,7 +450,7 @@ include("fbegin.inc"); <td width = "78%" class = "vtable"> <table width="236" id = "maintable"> <tbody> - + <tr> <td colspan = "4"> <div style = "font-size: 8pt; padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066;" @@ -481,7 +481,7 @@ include("fbegin.inc"); <?=gettext("Behaviour"); ?> </div> </td> - </tr> + </tr> <!-- PHP Code to generate the existing rules --> <?php if($container) { @@ -492,7 +492,7 @@ include("fbegin.inc"); <select name="protocol[]" class="formselect" id="protocol" style="font-size:8pt"> <?php foreach($avail_protos as $proto): ?> <option value="<?=$proto;?>" <?php if ($proto == $l7rule->GetRProtocol()) echo "selected"; ?>><?=$proto;?></option> - <? endforeach; ?> + <?php endforeach; ?> </select> </td> <td> @@ -512,7 +512,7 @@ include("fbegin.inc"); else { if($struct == "action") { ?> <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option> - <?php } + <?php } } } } ?> @@ -523,31 +523,31 @@ include("fbegin.inc"); <?php if($l7rule->GetRStructure() == "action"): ?> <?php foreach($avail_behaviours_action as $behaviour): ?> <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> - <? endforeach; ?> + <?php endforeach; ?> </select> - <? endif; ?> + <?php endif; ?> <?php if($l7rule->GetRStructure() == "queue"): ?> <?php foreach($avail_behaviours_altq as $behaviour): ?> <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> - <? endforeach; ?> + <?php endforeach; ?> </select> - <? endif; ?> + <?php endif; ?> <?php if($l7rule->GetRStructure() == "limiter"): ?> <?php foreach($avail_behaviours_limiter as $behaviour): ?> <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> - <? endforeach; ?> + <?php endforeach; ?> </select> - <? endif; ?> + <?php endif; ?> </td> <td> - <input type="image" src="/themes/<? echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow('maintable',this.parentNode.parentNode); return false;" value="<?=gettext("Delete"); ?>" /> + <input type="image" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow('maintable',this.parentNode.parentNode); return false;" value="<?=gettext("Delete"); ?>" /> </td> </tr> - + <?php } //end foreach } //end if - ?> + ?> </tbody> <tfoot> @@ -572,13 +572,13 @@ include("fbegin.inc"); <a href= "firewall_shaper_layer7.php"> <input id = "cancelbutton" name = "cancelbutton" type = "button" class = "formbtn" value = "<?=gettext("Cancel"); ?>" /></a> - + <?php if($container): ?> <input id = "delete" type="submit" class="formbtn" name="delete" value="<?=gettext("Delete"); ?>"></a> - <? endif ?> + <?php endif ?> </td> </tr> - <? endif; ?> + <?php endif; ?> <!-- End of layer7 rules form --> </table> @@ -590,7 +590,7 @@ include("fbegin.inc"); </table> </form> -<?php include("fend.inc"); +<?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index 7ed4b02..52f8698 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -369,7 +369,7 @@ include("fbegin.inc"); <?php if (count($dummynet_pipe_list) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> </td><td width="75%"> </td></tr> -<? endif; ?> +<?php endif; ?> <tr> <td width="25%" valign="top" algin="left"> <?php diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index f39fbe7..1ccfc2a 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -220,7 +220,7 @@ include("head.inc"); </tr> <tr> <td colspan="4"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> <?=gettext("NAT"); ?> </a><?=gettext("mappings.");?><br> <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p> </td> diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index e215253..2958657 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -379,7 +379,7 @@ function typesel_change() { <td class="vtable"> <table border="0" cellspacing="0" cellpadding="0"> <tr> - <td><?=gettext("Type");?>: </td> + <td><?=gettext("Type:");?> </td> <td><select name="type" class="formselect" onChange="typesel_change()"> <option value="single" <?php if ((!$pconfig['range'] && $pconfig['subnet_bits'] == 32) || (!isset($pconfig['subnet']))) echo "selected"; ?>> <?=gettext("Single address");?></option> @@ -390,7 +390,7 @@ function typesel_change() { </select></td> </tr> <tr> - <td><?=gettext("Address");?>: </td> + <td><?=gettext("Address:");?> </td> <td><input name="subnet" type="text" class="formfld unknown" id="subnet" size="20" value="<?=htmlspecialchars($pconfig['subnet']);?>"> /<select name="subnet_bits" class="formselect" id="select"> <?php for ($i = 32; $i >= 1; $i--): ?> @@ -465,7 +465,7 @@ function typesel_change() { <p> <span class="vexpl"> <span class="red"> - <b><?=gettext("Note");?>:<br></b> + <b><?=gettext("Note:");?><br></b> </span> <?=gettext("ProxyARP type IP addresses *DO NOT* work with add on packages such as Squid. Use a CARP or IP Alias type address for these cases.");?> <p> <?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> <?=gettext("CARP FAQ"); ?></A>. diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index be0abbf..1a7503a 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -1085,7 +1085,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <input name="mtu" type="text" class="formfld unknown" id="mtu" size="8" value="<?=htmlspecialchars($pconfig['mtu']);?>"> <br> <?=gettext("If you leave this field blank, " . - "an MTU of 1500 bytes will be assumed"); ?>. + "an MTU of 1500 bytes will be assumed."); ?> </td> </tr> <tr> @@ -1095,7 +1095,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <br> <?=gettext("If you enter a value in this field, then MSS clamping for " . "TCP connections to the value entered above minus 40 (TCP/IP " . - "header size) will be in effect."); ?>. + "header size) will be in effect."); ?> </td> </tr> <tr> @@ -1148,7 +1148,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" </select> <br/> <div id='addgwbox'> - <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one"); ?></a>. + <?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one."); ?></a> </div> <div id='notebox'> </div> @@ -1162,7 +1162,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <table bgcolor="#990000" cellpadding="1" cellspacing="1"> <tr><td> </td> <tr> - <td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway"); ?>:</font></b></center></td> + <td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway:"); ?></font></b></center></td> </tr> <tr><td> </td> <?php @@ -1170,16 +1170,16 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" $checked = " CHECKED"; ?> <tr> - <td width="45%" align="right"><font color="white"><?=gettext("Default gateway"); ?>:</td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td> + <td width="45%" align="right"><font color="white"><?=gettext("Default gateway:"); ?></td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Gateway Name"); ?>:</td><td><input id="name" name="name" value="<?=$wancfg['descr'] . "GW"?>"></td> + <td align="right"><font color="white"><?=gettext("Gateway Name:"); ?></td><td><input id="name" name="name" value="<?=$wancfg['descr'] . "GW"?>"></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Gateway IP"); ?>:</td><td><input id="gatewayip" name="gatewayip"></td> + <td align="right"><font color="white"><?=gettext("Gateway IP:"); ?></td><td><input id="gatewayip" name="gatewayip"></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Description"); ?>:</td><td><input id="gatewaydescr" name="gatewaydescr"></td> + <td align="right"><font color="white"><?=gettext("Description:"); ?></td><td><input id="gatewaydescr" name="gatewaydescr"></td> </tr> <tr><td> </td> <tr> @@ -1219,7 +1219,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <br> <?=gettext("The value in this field is sent as the DHCP client identifier " . "and hostname when requesting a DHCP lease. Some ISPs may require " . - "this (for client identification)"); ?>. + "this (for client identification)."); ?> </td> </tr> <tr> @@ -1238,7 +1238,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" ?> </select> <?=gettext("The value in this field is used as a fixed alias IP address by the " . - "DHCP client"); ?>. + "DHCP client."); ?> </td> </tr> </table> @@ -1255,7 +1255,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td width="78%" class="vtable"> <table border="0" cellpadding="0" cellspacing="0"> <tr id="trcountry"> - <td><?=gettext("Country"); ?> : </td> + <td><?=gettext("Country:"); ?> </td> <td> <select class="formselect" name="country" id="country" onChange="providers_list()"> <option></option> @@ -1263,7 +1263,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" </td> </tr> <tr id="trprovider" style="display:none"> - <td><?=gettext("Provider"); ?> : </td> + <td><?=gettext("Provider:"); ?> </td> <td> <select class="formselect" name="provider" id="provider" onChange="providerplan_list()"> <option></option> @@ -1271,7 +1271,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" </td> </tr> <tr id="trproviderplan" style="display:none"> - <td><?=gettext("Plan"); ?> : </td> + <td><?=gettext("Plan:"); ?> </td> <td> <select class="formselect" name="providerplan" id="providerplan" onChange="prefill_provider()"> <option></option> @@ -1328,15 +1328,15 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td width="22%" valign="top" class="vncell"><?=gettext("Advanced PPP"); ?></td> <?php if (isset($pconfig['pppid'])): ?> <td width="78%" class="vtable"> - <a href="/interfaces_ppps_edit.php?id=<?=htmlspecialchars($pconfig['pppid']);?>" class="navlnk"><?=gettext("Click here "); ?></a> - <?=gettext("to edit PPP configuration"); ?>. + <a href="/interfaces_ppps_edit.php?id=<?=htmlspecialchars($pconfig['pppid']);?>" class="navlnk"><?=gettext("Click here"); ?> </a> + <?=gettext("to edit PPP configuration."); ?> </td> - <? else: ?> + <?php else: ?> <td width="78%" class="vtable"> - <a href="/interfaces_ppps_edit.php" class="navlnk"><?=gettext("Click here"); ?></a> - <?=gettext("to create a PPP configuration"); ?>. + <a href="/interfaces_ppps_edit.php" class="navlnk"><?=gettext("Click here"); ?> </a> + <?=gettext("to create a PPP configuration."); ?> </td> - <? endif; ?> + <?php endif; ?> </tr> </table> </td> @@ -1370,13 +1370,13 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td width="78%" class="vtable"> <input name="pppoe_dialondemand" type="checkbox" id="pppoe_dialondemand" value="enable" <?php if ($pconfig['pppoe_dialondemand']) echo "checked"; ?>> <strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br> - <?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a "); ?><i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected"); ?>. + <?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a "); ?><i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td> <td width="78%" class="vtable"> - <input name="pppoe_idletimeout" type="text" class="formfld unknown" id="pppoe_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pppoe_idletimeout']);?>"> <?=gettext("seconds"); ?><br><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature"); ?>. + <input name="pppoe_idletimeout" type="text" class="formfld unknown" id="pppoe_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pppoe_idletimeout']);?>"> <?=gettext("seconds"); ?><br><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?> </td> </tr> <tr> @@ -1404,7 +1404,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <input name="pppoe_resetdate" type="text" class="w8em format-m-d-y highlight-days-67" id="pppoe_resetdate" maxlength="10" size="10" value="<?=htmlspecialchars($pconfig['pppoe_resetdate']);?>" /> <?=gettext("reset at a specific date (mm/dd/yyyy)"); ?> <br /> <br /> - <span class="red"><strong><?=gettext("Note"); ?>: </strong></span> + <span class="red"><strong><?=gettext("Note:"); ?> </strong></span> <?=gettext("If you leave the date field empty, the reset will be executed each day at the time you did specify using the minutes and hour field."); ?> </p> <?php if ($pconfig['pppoe_pr_preset']): ?> @@ -1435,14 +1435,14 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <?php if (isset($pconfig['pppid'])): ?> <td width="78%" class="vtable"> <a href="/interfaces_ppps_edit.php?id=<?=htmlspecialchars($pconfig['pppid']);?>" class="navlnk"><?=gettext("Click here"); ?> </a> - <?=gettext("for additional PPPoE configuration options. Save first if you made changes"); ?>. + <?=gettext("for additional PPPoE configuration options. Save first if you made changes."); ?> </td> - <? else: ?> + <?php else: ?> <td width="78%" class="vtable"> <a href="/interfaces_ppps_edit.php" class="navlnk"><?=gettext("Click here"); ?> </a> - <?=gettext("for advanced PPPoE configuration options and MLPPP configuration"); ?>. + <?=gettext("for advanced PPPoE configuration options and MLPPP configuration."); ?> </td> - <? endif; ?> + <?php endif; ?> </tr> </table> </td> @@ -1489,13 +1489,13 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td width="78%" class="vtable"> <input name="pptp_dialondemand" type="checkbox" id="pptp_dialondemand" value="enable" <?php if ($pconfig['pptp_dialondemand']) echo "checked"; ?>> <strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br> - <?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a"); ?> <i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected"); ?>. + <?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a"); ?> <i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td> <td width="78%" class="vtable"> - <input name="pptp_idletimeout" type="text" class="formfld unknown" id="pptp_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pptp_idletimeout']);?>"> <?=gettext("seconds"); ?><br><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature"); ?>. + <input name="pptp_idletimeout" type="text" class="formfld unknown" id="pptp_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pptp_idletimeout']);?>"> <?=gettext("seconds"); ?><br><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?> </td> </tr> <tr> @@ -1503,14 +1503,14 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <?php if (isset($pconfig['pppid'])): ?> <td width="78%" class="vtable"> <a href="/interfaces_ppps_edit.php?id=<?=htmlspecialchars($pconfig['pppid']);?>" class="navlnk"><?=gettext("Click here");?></a> - <?=gettext("for additional PPTP and L2TP configuration options. Save first if you made changes");?>. + <?=gettext("for additional PPTP and L2TP configuration options. Save first if you made changes.");?> </td> - <? else: ?> + <?php else: ?> <td width="78%" class="vtable"> <a href="/interfaces_ppps_edit.php" class="navlnk"><?=gettext("Click here");?></a> <?=gettext("for advanced PPTP and L2TP configuration options");?>. </td> - <? endif; ?> + <?php endif; ?> </tr> </table> </td> @@ -1528,8 +1528,8 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <tr> <td valign="top" class="vncell"><?=gettext("Persist common settings");?></td> <td class="vtable"> - <input name="persistcommonwireless" type="checkbox" value="yes" class="formfld" id="persistcommonwireless" <? if ($pconfig['persistcommonwireless']) echo "checked";?>> - <br/><?=gettext("Enabling this preserves the common wireless configuration through interface deletions and reassignments");?>. + <input name="persistcommonwireless" type="checkbox" value="yes" class="formfld" id="persistcommonwireless" <?php if ($pconfig['persistcommonwireless']) echo "checked";?>> + <br/><?=gettext("Enabling this preserves the common wireless configuration through interface deletions and reassignments.");?> </td> </tr> <tr> @@ -1552,12 +1552,12 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td valign="top" class="vncellreq">802.11g OFDM <?=gettext("Protection Mode"); ?></td> <td class="vtable"> <select name="protmode" class="formselect" id="protmode"> - <option <? if ($pconfig['protmode'] == 'off') echo "selected";?> value="off"><?=gettext("Protection mode off"); ?></option> - <option <? if ($pconfig['protmode'] == 'cts') echo "selected";?> value="cts"><?=gettext("Protection mode CTS to self"); ?></option> - <option <? if ($pconfig['protmode'] == 'rtscts') echo "selected";?> value="rtscts"><?=gettext("Protection mode RTS and CTS"); ?></option> + <option <?php if ($pconfig['protmode'] == 'off') echo "selected";?> value="off"><?=gettext("Protection mode off"); ?></option> + <option <?php if ($pconfig['protmode'] == 'cts') echo "selected";?> value="cts"><?=gettext("Protection mode CTS to self"); ?></option> + <option <?php if ($pconfig['protmode'] == 'rtscts') echo "selected";?> value="rtscts"><?=gettext("Protection mode RTS and CTS"); ?></option> </select> <br/> - <?=gettext("For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network"); ?>. + <?=gettext("For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network."); ?> <br/> </td> </tr> @@ -1578,14 +1578,14 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" } ?> </select><br/> - <?=gettext("Note: Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. Not all adaptors support changing the transmit power setting"); ?>. + <?=gettext("Note: Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. Not all adaptors support changing the transmit power setting."); ?> </td> </tr> <tr> <td valign="top" class="vncellreq"><?=gettext("Channel"); ?></td> <td class="vtable"> <select name="channel" class="formselect" id="channel"> - <option <? if ($pconfig['channel'] == 0) echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> + <option <?php if ($pconfig['channel'] == 0) echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> <?php foreach($wl_modes as $wl_standard => $wl_channels) { if($wl_standard == "11g") { $wl_standard = "11b/g"; } @@ -1607,7 +1607,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <br/> <?=gettext("Legend: wireless standards - channel # (frequency @ max TX power / TX power allowed in reg. domain)"); ?> <br/> - <?=gettext("Note: Not all channels may be supported by your card. Auto may override the wireless standard selected above"); ?>. + <?=gettext("Note: Not all channels may be supported by your card. Auto may override the wireless standard selected above."); ?> </td> </tr> <?php if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])): ?> @@ -1620,9 +1620,9 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td> <?=gettext("Diversity"); ?><br/> <select name="diversity" class="formselect" id="diversity"> - <option <? if (empty($pconfig['diversity'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> - <option <? if ($pconfig['diversity'] == '0') echo "selected"; ?> value="0"><?=gettext("Off"); ?></option> - <option <? if ($pconfig['diversity'] == '1') echo "selected"; ?> value="1"><?=gettext("On"); ?></option> + <option <?php if (empty($pconfig['diversity'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if ($pconfig['diversity'] == '0') echo "selected"; ?> value="0"><?=gettext("Off"); ?></option> + <option <?php if ($pconfig['diversity'] == '1') echo "selected"; ?> value="1"><?=gettext("On"); ?></option> </select> </td> <td>  </td> @@ -1631,10 +1631,10 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td> <?=gettext("Transmit antenna"); ?><br/> <select name="txantenna" class="formselect" id="txantenna"> - <option <? if (empty($pconfig['txantenna'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> - <option <? if ($pconfig['txantenna'] == '0') echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> - <option <? if ($pconfig['txantenna'] == '1') echo "selected"; ?> value="1"><?=gettext("#1"); ?></option> - <option <? if ($pconfig['txantenna'] == '2') echo "selected"; ?> value="2"><?=gettext("#2"); ?></option> + <option <?php if (empty($pconfig['txantenna'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if ($pconfig['txantenna'] == '0') echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> + <option <?php if ($pconfig['txantenna'] == '1') echo "selected"; ?> value="1"><?=gettext("#1"); ?></option> + <option <?php if ($pconfig['txantenna'] == '2') echo "selected"; ?> value="2"><?=gettext("#2"); ?></option> </select> </td> <td>  </td> @@ -1643,10 +1643,10 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td> <?=gettext("Receive antenna"); ?><br/> <select name="rxantenna" class="formselect" id="rxantenna"> - <option <? if (empty($pconfig['rxantenna'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> - <option <? if ($pconfig['rxantenna'] == '0') echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> - <option <? if ($pconfig['rxantenna'] == '1') echo "selected"; ?> value="1"><?=gettext("#1"); ?></option> - <option <? if ($pconfig['rxantenna'] == '2') echo "selected"; ?> value="2"><?=gettext("#2"); ?></option> + <option <?php if (empty($pconfig['rxantenna'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if ($pconfig['rxantenna'] == '0') echo "selected"; ?> value="0"><?=gettext("Auto"); ?></option> + <option <?php if ($pconfig['rxantenna'] == '1') echo "selected"; ?> value="1"><?=gettext("#1"); ?></option> + <option <?php if ($pconfig['rxantenna'] == '2') echo "selected"; ?> value="2"><?=gettext("#2"); ?></option> </select> </td> <?php endif; ?> @@ -1673,7 +1673,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td class="vtable"> <?=gettext("Regulatory domain"); ?><br/> <select name="regdomain" class="formselect" id="regdomain"> - <option <? if (empty($pconfig['regdomain'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if (empty($pconfig['regdomain'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> <?php foreach($wl_regdomains as $wl_regdomain_key => $wl_regdomain) { echo "<option "; @@ -1685,11 +1685,11 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" ?> </select> <br/> - <?=gettext("Note: Some cards have a default that is not recognized and require changing the regulatory domain to one in this list for the changes to other regulatory settings to work"); ?>. + <?=gettext("Note: Some cards have a default that is not recognized and require changing the regulatory domain to one in this list for the changes to other regulatory settings to work."); ?> <br/><br/> <?=gettext("Country (listed with country code and regulatory domain)"); ?><br/> <select name="regcountry" class="formselect" id="regcountry"> - <option <? if (empty($pconfig['regcountry'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if (empty($pconfig['regcountry'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> <?php foreach($wl_countries as $wl_country_key => $wl_country) { echo "<option "; @@ -1705,15 +1705,15 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <br/><br/> <?=gettext("Location"); ?><br/> <select name="reglocation" class="formselect" id="reglocation"> - <option <? if (empty($pconfig['reglocation'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> - <option <? if ($pconfig['reglocation'] == 'indoor') echo "selected"; ?> value="indoor"><?=gettext("Indoor"); ?></option> - <option <? if ($pconfig['reglocation'] == 'outdoor') echo "selected"; ?> value="outdoor"><?=gettext("Outdoor"); ?></option> - <option <? if ($pconfig['reglocation'] == 'anywhere') echo "selected"; ?> value="anywhere"><?=gettext("Anywhere"); ?></option> + <option <?php if (empty($pconfig['reglocation'])) echo "selected"; ?> value=""><?=gettext("Default"); ?></option> + <option <?php if ($pconfig['reglocation'] == 'indoor') echo "selected"; ?> value="indoor"><?=gettext("Indoor"); ?></option> + <option <?php if ($pconfig['reglocation'] == 'outdoor') echo "selected"; ?> value="outdoor"><?=gettext("Outdoor"); ?></option> + <option <?php if ($pconfig['reglocation'] == 'anywhere') echo "selected"; ?> value="anywhere"><?=gettext("Anywhere"); ?></option> </select> <br/><br/> - <?=gettext("These settings may affect which channels are available and the maximum transmit power allowed on those channels. Using the correct settings to comply with local regulatory requirements is recommended"); ?>. + <?=gettext("These settings may affect which channels are available and the maximum transmit power allowed on those channels. Using the correct settings to comply with local regulatory requirements is recommended."); ?> <br/> - <?=gettext("Note: All wireless networks on this interface will be temporarily brought down when changing regulatory settings. Some of the regulatory domains or country codes may not be allowed by some cards. These settings may not be able to add additional channels that are not already supported"); ?>. + <?=gettext("Note: All wireless networks on this interface will be temporarily brought down when changing regulatory settings. Some of the regulatory domains or country codes may not be allowed by some cards. These settings may not be able to add additional channels that are not already supported."); ?> </td> </tr> <tr> @@ -1726,9 +1726,9 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td valign="top" class="vncellreq"><?=gettext("Mode"); ?></td> <td class="vtable"> <select name="mode" class="formselect" id="mode"> - <option <? if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss"><?=gettext("Infrastructure (BSS)"); ?></option> - <option <? if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc"><?=gettext("Ad-hoc (IBSS)"); ?></option> - <option <? if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap"><?=gettext("Access Point"); ?></option> + <option <?php if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss"><?=gettext("Infrastructure (BSS)"); ?></option> + <option <?php if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc"><?=gettext("Ad-hoc (IBSS)"); ?></option> + <option <?php if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap"><?=gettext("Access Point"); ?></option> </select> </td> </tr> @@ -1743,56 +1743,56 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td valign="top" class="vncell"><?=gettext("Minimum wireless standard"); ?></td> <td class="vtable"> <select name="puremode" class="formselect" id="puremode"> - <option <? if ($pconfig['puremode'] == 'any') echo "selected";?> value="any"><?=gettext("Any"); ?></option> + <option <?php if ($pconfig['puremode'] == 'any') echo "selected";?> value="any"><?=gettext("Any"); ?></option> <?php if (isset($wl_modes['11g'])): ?> - <option <? if ($pconfig['puremode'] == '11g') echo "selected";?> value="11g">802.11g</option> + <option <?php if ($pconfig['puremode'] == '11g') echo "selected";?> value="11g"><?=gettext("802.11g"); ?></option> <?php endif; ?> - <option <? if ($pconfig['puremode'] == '11n') echo "selected";?> value="11n">802.11n</option> + <option <?php if ($pconfig['puremode'] == '11n') echo "selected";?> value="11n"><?=gettext("802.11n"); ?></option> </select> <br/> - <?=gettext("When operating as an access point, allow only stations capable of the selected wireless standard to associate (stations not capable are not permitted to associate)"); ?>. + <?=gettext("When operating as an access point, allow only stations capable of the selected wireless standard to associate (stations not capable are not permitted to associate)."); ?> </td> </tr> <?php elseif (isset($wl_modes['11g'])): ?> <tr> - <td valign="top" class="vncell">802.11g <?=gettext("only"); ?></td> + <td valign="top" class="vncell"><?=gettext("802.11g only"); ?></td> <td class="vtable"> - <input name="puremode" type="checkbox" value="11g" class="formfld" id="puremode" <? if ($pconfig['puremode'] == '11g') echo "checked";?>> - <br/><?=gettext("When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)"); ?>. + <input name="puremode" type="checkbox" value="11g" class="formfld" id="puremode" <?php if ($pconfig['puremode'] == '11g') echo "checked";?>> + <br/><?=gettext("When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)."); ?> </td> </tr> <?php endif; ?> <tr> <td valign="top" class="vncell"><?=gettext("Allow intra-BSS communication"); ?></td> <td class="vtable"> - <input name="apbridge_enable" type="checkbox" value="yes" class="formfld" id="apbridge_enable" <? if ($pconfig['apbridge_enable']) echo "checked";?>> + <input name="apbridge_enable" type="checkbox" value="yes" class="formfld" id="apbridge_enable" <?php if ($pconfig['apbridge_enable']) echo "checked";?>> <br/> - <?=gettext("When operating as an access point, enable this if you want to pass packets between wireless clients directly"); ?>. + <?=gettext("When operating as an access point, enable this if you want to pass packets between wireless clients directly."); ?> <br/> - <?=gettext("Disabling the internal bridging is useful when traffic is to be processed with packet filtering"); ?>. + <?=gettext("Disabling the internal bridging is useful when traffic is to be processed with packet filtering."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Enable WME"); ?></td> <td class="vtable"> - <input name="wme_enable" type="checkbox" class="formfld" id="wme_enable" value="yes" <? if ($pconfig['wme_enable']) echo "checked";?>> - <br/><?=gettext("Setting this option will force the card to use WME (wireless QoS)"); ?>. + <input name="wme_enable" type="checkbox" class="formfld" id="wme_enable" value="yes" <?php if ($pconfig['wme_enable']) echo "checked";?>> + <br/><?=gettext("Setting this option will force the card to use WME (wireless QoS)."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Enable Hide SSID"); ?></td> <td class="vtable"> - <input name="hidessid_enable" type="checkbox" class="formfld" id="hidessid_enable" value="yes" <? if ($pconfig['hidessid_enable']) echo "checked";?>> + <input name="hidessid_enable" type="checkbox" class="formfld" id="hidessid_enable" value="yes" <?php if ($pconfig['hidessid_enable']) echo "checked";?>> <br/> <?=gettext("Setting this option will force the card to NOT broadcast its SSID"); ?> <br/> - <?=gettext("(this might create problems for some clients)"); ?>. + <?=gettext("(this might create problems for some clients)."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("WEP"); ?></td> <td class="vtable"> - <input name="wep_enable" type="checkbox" id="wep_enable" value="yes" <? if ($pconfig['wep_enable']) echo "checked"; ?>> + <input name="wep_enable" type="checkbox" id="wep_enable" value="yes" <?php if ($pconfig['wep_enable']) echo "checked"; ?>> <strong><?=gettext("Enable WEP"); ?></strong> <table border="0" cellspacing="0" cellpadding="0"> <tr> @@ -1801,51 +1801,51 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td> <?=gettext("TX key"); ?> </td> </tr> <tr> - <td><?=gettext("Key"); ?> 1: </td> + <td><?=gettext("Key 1:"); ?> </td> <td> <input name="key1" type="text" class="formfld unknown" id="key1" size="30" value="<?=htmlspecialchars($pconfig['key1']);?>"> </td> <td align="center"> - <input name="txkey" type="radio" value="1" <? if ($pconfig['txkey'] == 1) echo "checked";?>> + <input name="txkey" type="radio" value="1" <?php if ($pconfig['txkey'] == 1) echo "checked";?>> </td> </tr> <tr> - <td><?=gettext("Key"); ?> 2: </td> + <td><?=gettext("Key 2:"); ?> </td> <td> <input name="key2" type="text" class="formfld unknown" id="key2" size="30" value="<?=htmlspecialchars($pconfig['key2']);?>"> </td> <td align="center"> - <input name="txkey" type="radio" value="2" <? if ($pconfig['txkey'] == 2) echo "checked";?>> + <input name="txkey" type="radio" value="2" <?php if ($pconfig['txkey'] == 2) echo "checked";?>> </td> </tr> <tr> - <td><?=gettext("Key"); ?> 3: </td> + <td><?=gettext("Key 3:"); ?> </td> <td> <input name="key3" type="text" class="formfld unknown" id="key3" size="30" value="<?=htmlspecialchars($pconfig['key3']);?>"> </td> <td align="center"> - <input name="txkey" type="radio" value="3" <? if ($pconfig['txkey'] == 3) echo "checked";?>> + <input name="txkey" type="radio" value="3" <?php if ($pconfig['txkey'] == 3) echo "checked";?>> </td> </tr> <tr> - <td><?=gettext("Key"); ?> 4: </td> + <td><?=gettext("Key 4:"); ?> </td> <td> <input name="key4" type="text" class="formfld unknown" id="key4" size="30" value="<?=htmlspecialchars($pconfig['key4']);?>"> </td> <td align="center"> - <input name="txkey" type="radio" value="4" <? if ($pconfig['txkey'] == 4) echo "checked";?>> + <input name="txkey" type="radio" value="4" <?php if ($pconfig['txkey'] == 4) echo "checked";?>> </td> </tr> </table> <br/> - <?=gettext("40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by '0x'"); ?>.<br/> - <?=gettext("104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by '0x'"); ?>. + <?=gettext("40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by '0x'."); ?><br/> + <?=gettext("104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by '0x'."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("WPA"); ?></td> <td class="vtable"> - <input name="wpa_enable" type="checkbox" class="formfld" id="wpa_enable" value="yes" <? if ($pconfig['wpa_enable']) echo "checked"; ?>> + <input name="wpa_enable" type="checkbox" class="formfld" id="wpa_enable" value="yes" <?php if ($pconfig['wpa_enable']) echo "checked"; ?>> <strong><?=gettext("Enable WPA"); ?></strong> <br/><br/> <table border="0" cellspacing="0" cellpadding="0"> @@ -1854,22 +1854,22 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td> <?=gettext("WPA Pre Shared Key"); ?> </td> </tr> <tr> - <td><?=gettext("PSK"); ?>: </td> + <td><?=gettext("PSK:"); ?> </td> <td> <input name="passphrase" type="text" class="formfld unknown" id="passphrase" size="66" value="<?=htmlspecialchars($pconfig['passphrase']);?>"> </td> </tr> </table> - <br/><?=gettext("Passphrase must be from 8 to 63 characters"); ?>. + <br/><?=gettext("Passphrase must be from 8 to 63 characters."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("WPA Mode"); ?></td> <td class="vtable"> <select name="wpa_mode" class="formselect" id="wpa_mode"> - <option <? if ($pconfig['wpa_mode'] == '1') echo "selected";?> value="1"><?=gettext("WPA"); ?></option> - <option <? if ($pconfig['wpa_mode'] == '2') echo "selected";?> value="2"><?=gettext("WPA2"); ?></option> - <option <? if ($pconfig['wpa_mode'] == '3') echo "selected";?> value="3"><?=gettext("Both"); ?></option> + <option <?php if ($pconfig['wpa_mode'] == '1') echo "selected";?> value="1"><?=gettext("WPA"); ?></option> + <option <?php if ($pconfig['wpa_mode'] == '2') echo "selected";?> value="2"><?=gettext("WPA2"); ?></option> + <option <?php if ($pconfig['wpa_mode'] == '3') echo "selected";?> value="3"><?=gettext("Both"); ?></option> </select> </td> </tr> @@ -1877,9 +1877,9 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td valign="top" class="vncell"><?=gettext("WPA Key Management Mode"); ?></td> <td class="vtable"> <select name="wpa_key_mgmt" class="formselect" id="wpa_key_mgmt"> - <option <? if ($pconfig['wpa_key_mgmt'] == 'WPA-PSK') echo "selected";?> value="WPA-PSK"><?=gettext("Pre Shared Key"); ?></option> - <option <? if ($pconfig['wpa_key_mgmt'] == 'WPA-EAP') echo "selected";?> value="WPA-EAP"><?=gettext("Extensible Authentication Protocol"); ?></option> - <option <? if ($pconfig['wpa_key_mgmt'] == 'WPA-PSK WPA-EAP') echo "selected";?> value="WPA-PSK WPA-EAP"><?=gettext("Both"); ?></option> + <option <?php if ($pconfig['wpa_key_mgmt'] == 'WPA-PSK') echo "selected";?> value="WPA-PSK"><?=gettext("Pre Shared Key"); ?></option> + <option <?php if ($pconfig['wpa_key_mgmt'] == 'WPA-EAP') echo "selected";?> value="WPA-EAP"><?=gettext("Extensible Authentication Protocol"); ?></option> + <option <?php if ($pconfig['wpa_key_mgmt'] == 'WPA-PSK WPA-EAP') echo "selected";?> value="WPA-PSK WPA-EAP"><?=gettext("Both"); ?></option> </select> </td> </tr> @@ -1887,50 +1887,50 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <td valign="top" class="vncell"><?=gettext("Authentication"); ?></td> <td class="vtable"> <select name="auth_algs" class="formselect" id="auth_algs"> - <option <? if ($pconfig['auth_algs'] == '1') echo "selected";?> value="1"><?=gettext("Open System Authentication"); ?></option> - <option <? if ($pconfig['auth_algs'] == '2') echo "selected";?> value="2"><?=gettext("Shared Key Authentication"); ?></option> - <option <? if ($pconfig['auth_algs'] == '3') echo "selected";?> value="3">Both</option> + <option <?php if ($pconfig['auth_algs'] == '1') echo "selected";?> value="1"><?=gettext("Open System Authentication"); ?></option> + <option <?php if ($pconfig['auth_algs'] == '2') echo "selected";?> value="2"><?=gettext("Shared Key Authentication"); ?></option> + <option <?php if ($pconfig['auth_algs'] == '3') echo "selected";?> value="3"><?=gettext("Both"); ?></option> </select> - <br/><?=gettext("Note: Shared Key Authentication requires WEP"); ?>.</br> + <br/><?=gettext("Note: Shared Key Authentication requires WEP."); ?></br> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("WPA Pairwise"); ?></td> <td class="vtable"> <select name="wpa_pairwise" class="formselect" id="wpa_pairwise"> - <option <? if ($pconfig['wpa_pairwise'] == 'CCMP TKIP') echo "selected";?> value="CCMP TKIP"><?=gettext("Both"); ?></option> - <option <? if ($pconfig['wpa_pairwise'] == 'CCMP') echo "selected";?> value="CCMP"><?=gettext("AES (recommended)"); ?></option> - <option <? if ($pconfig['wpa_pairwise'] == 'TKIP') echo "selected";?> value="TKIP"><?=gettext("TKIP"); ?></option> + <option <?php if ($pconfig['wpa_pairwise'] == 'CCMP TKIP') echo "selected";?> value="CCMP TKIP"><?=gettext("Both"); ?></option> + <option <?php if ($pconfig['wpa_pairwise'] == 'CCMP') echo "selected";?> value="CCMP"><?=gettext("AES (recommended)"); ?></option> + <option <?php if ($pconfig['wpa_pairwise'] == 'TKIP') echo "selected";?> value="TKIP"><?=gettext("TKIP"); ?></option> </select> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Key Rotation"); ?></td> <td class="vtable"> - <input name="wpa_group_rekey" type="text" class="formfld unknown" id="wpa_group_rekey" size="30" value="<? echo $pconfig['wpa_group_rekey'] ? $pconfig['wpa_group_rekey'] : "60";?>"> - <br/><?=gettext("Allowed values are 1-9999 but should not be longer than Master Key Regeneration time"); ?>. + <input name="wpa_group_rekey" type="text" class="formfld unknown" id="wpa_group_rekey" size="30" value="<?php echo $pconfig['wpa_group_rekey'] ? $pconfig['wpa_group_rekey'] : "60";?>"> + <br/><?=gettext("Allowed values are 1-9999 but should not be longer than Master Key Regeneration time."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Master Key Regeneration"); ?></td> <td class="vtable"> - <input name="wpa_gmk_rekey" type="text" class="formfld" id="wpa_gmk_rekey" size="30" value="<? echo $pconfig['wpa_gmk_rekey'] ? $pconfig['wpa_gmk_rekey'] : "3600";?>"> - <br/><?=gettext("Allowed values are 1-9999 but should not be shorter than Key Rotation time"); ?>. + <input name="wpa_gmk_rekey" type="text" class="formfld" id="wpa_gmk_rekey" size="30" value="<?php echo $pconfig['wpa_gmk_rekey'] ? $pconfig['wpa_gmk_rekey'] : "3600";?>"> + <br/><?=gettext("Allowed values are 1-9999 but should not be shorter than Key Rotation time."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Strict Key Regeneration"); ?></td> <td class="vtable"> - <input name="wpa_strict_rekey" type="checkbox" value="yes" class="formfld" id="wpa_strict_rekey" <? if ($pconfig['wpa_strict_rekey']) echo "checked"; ?>> - <br/><?=gettext("Setting this option will force the AP to rekey whenever a client disassociates"); ?>. + <input name="wpa_strict_rekey" type="checkbox" value="yes" class="formfld" id="wpa_strict_rekey" <?php if ($pconfig['wpa_strict_rekey']) echo "checked"; ?>> + <br/><?=gettext("Setting this option will force the AP to rekey whenever a client disassociates."); ?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Enable IEEE802.1X Authentication"); ?></td> <td class="vtable"> - <input name="ieee8021x" type="checkbox" value="yes" class="formfld" id="ieee8021x" <? if ($pconfig['ieee8021x']) echo "checked";?>> - <br/><?=gettext("Setting this option will enable 802.1x authentication"); ?>. - <br/><span class="red"><strong><?=gettext("NOTE"); ?>:</strong</span> <?=gettext("this option requires checking the \"Enable WPA box\""); ?>. + <input name="ieee8021x" type="checkbox" value="yes" class="formfld" id="ieee8021x" <?php if ($pconfig['ieee8021x']) echo "checked";?>> + <br/><?=gettext("Setting this option will enable 802.1x authentication."); ?> + <br/><span class="red"><strong><?=gettext("NOTE"); ?>:</strong</span> <?=gettext("this option requires checking the \"Enable WPA box\"."); ?> </td> </tr> <tr> @@ -1941,14 +1941,14 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" </td> </tr> <tr> - <td valign="top" class="vncell">802.1X <?=gettext("Authentication Server Port"); ?></td> + <td valign="top" class="vncell"><?=gettext("802.1X Authentication Server Port"); ?></td> <td class="vtable"> <input name="auth_server_port" id="auth_server_port" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_port']);?>"> - <br/><?=gettext("Leave blank for the default 1812 port"); ?>. + <br/><?=gettext("Leave blank for the default 1812 port."); ?> </td> </tr> <tr> - <td valign="top" class="vncell">802.1X <?=gettext("Authentication Server Shared Secret"); ?></td> + <td valign="top" class="vncell"><?=gettext("802.1X Authentication Server Shared Secret"); ?></td> <td class="vtable"> <input name="auth_server_shared_secret" id="auth_server_shared_secret" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_shared_secret']);?>"> <br/> @@ -1961,7 +1961,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <br/> </td> </tr> - <? endif; ?> + <?php endif; ?> <tr> <td colspan="2" valign="top" height="16"></td> </tr> @@ -1976,9 +1976,9 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <strong><?=gettext("Block private networks"); ?></strong><br> <?=gettext("When set, this option blocks traffic from IP addresses that are reserved " . "for private networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as"); ?> - <?=gettext("well as loopback addresses (127/8)"); ?>. <?=gettext("You should generally " . + <?=gettext("well as loopback addresses (127/8)."); ?> <?=gettext("You should generally " . "leave this option turned on, unless your WAN network lies in such " . - "a private address space, too"); ?>. + "a private address space, too."); ?> </td> </tr> <tr> @@ -1987,9 +1987,9 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" <input name="blockbogons" type="checkbox" id="blockbogons" value="yes" <?php if ($pconfig['blockbogons']) echo "checked"; ?>> <strong><?=gettext("Block bogon networks"); ?></strong><br> <?=gettext("When set, this option blocks traffic from IP addresses that are reserved " . - "(but not RFC 1918) or not yet assigned by IANA"); ?>. + "(but not RFC 1918) or not yet assigned by IANA."); ?> <?=gettext("Bogons are prefixes that should never appear in the Internet routing table, " . - "and obviously should not appear as the source address in any packets you receive"); ?>. + "and obviously should not appear as the source address in any packets you receive."); ?> </td> </tr> <tr> @@ -2067,7 +2067,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" optn.value = value; selectbox.options.add(optn); selectbox.selectedIndex = (selectbox.options.length-1); - $('notebox').innerHTML="<p/><strong>NOTE:</strong> You can manage Gateways <a target='_new' href='system_gateways.php'>here</a>."; + $('notebox').innerHTML="<p/><strong><?=gettext("NOTE:"); ?></strong> <?=gettext("You can manage Gateways"); ?> <a target='_new' href='system_gateways.php'><?=gettext("here"); ?></a>."; } function report_failure() { alert("Sorry, we could not create your gateway at this time."); diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index ad31e59..b48d2f2 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -141,9 +141,9 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("Here you can configure bridging of interfaces"); ?>. + <?=gettext("Here you can configure bridging of interfaces."); ?> </td> <td class="list"> </td> </tr> diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 1a32ff5..8a9afb4 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -439,7 +439,7 @@ function show_source_port_range() { "the bridge."); ?> </span> <p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> <?=gettext("The span interface cannot be part of the bridge member interfaces."); ?> </span> @@ -483,7 +483,7 @@ function show_source_port_range() { <?=gettext("Allow interface to automatically detect edge status. This is the " . "default for all interfaces added to a bridge."); ?> <p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> <?=gettext("This will disable the autoedge status of interfaces."); ?> </span></td> @@ -527,7 +527,7 @@ function show_source_port_range() { "checking the full duplex link status. This is the default for " . "interfaces added to the bridge."); ?> <p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> <?=gettext("The interfaces selected here will be removed from default autoedge status."); ?> </span></td> diff --git a/usr/local/www/interfaces_gif.php b/usr/local/www/interfaces_gif.php index 98748d9..c062a9a 100644 --- a/usr/local/www/interfaces_gif.php +++ b/usr/local/www/interfaces_gif.php @@ -129,9 +129,9 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("GIF tunnels are configured here"); ?>. + <?=gettext("GIF tunnels are configured here."); ?> </td> <td class="list"> </td> </tr> diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index de2992b..c9fa525 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -130,7 +130,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="3"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></span></p> </td> </tr> </table> diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php index 54670b4..fe39891 100755 --- a/usr/local/www/interfaces_groups.php +++ b/usr/local/www/interfaces_groups.php @@ -145,7 +145,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="3"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note.");?><br></strong></span><?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?></span></p> </td> </tr> </table> diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index 9cabb00..baf16f5 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -135,9 +135,9 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG"); ?>. + <?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG."); ?> </td> <td class="list"> </td> </tr> diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 07e8e83..54c5cb5 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -474,7 +474,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" <td width="78%" class="vtable"> <table border="0" cellpadding="0" cellspacing="0"> <tr id="trcountry" style="display:none"> - <td><?= gettext("Country"); ?> : </td> + <td><?= gettext("Country:"); ?> </td> <td> <select class="formselect" name="country" id="country" onChange="providers_list()"> <option></option> @@ -482,7 +482,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" </td> </tr> <tr id="trprovider" style="display:none"> - <td><?= gettext("Provider"); ?> : </td> + <td><?= gettext("Provider:"); ?> </td> <td> <select class="formselect" name="provider" id="provider" onChange="providerplan_list()"> <option></option> @@ -490,7 +490,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" </td> </tr> <tr id="trproviderplan" style="display:none"> - <td><?= gettext("Plan"); ?> : </td> + <td><?= gettext("Plan:"); ?> </td> <td> <select class="formselect" name="providerplan" id="providerplan" onChange="prefill_provider()"> <option></option> @@ -611,7 +611,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" <input name="pppoe_resetdate" type="text" class="w8em format-m-d-y highlight-days-67" id="pppoe_resetdate" maxlength="10" size="10" value="<?=htmlspecialchars($pconfig['pppoe_resetdate']);?>" /> <?= gettext("reset at a specific date (mm/dd/yyyy)"); ?> <br /> <br /> - <span class="red"><strong><?=gettext("Note ");?>:</strong></span> + <span class="red"><strong><?=gettext("Note:");?></strong></span> <?= gettext("If you leave the date field empty, the reset will be executed each day at the time you did specify using the minutes and hour field."); ?> </p> <?php if ($pconfig['pppoe_pr_preset']): ?> diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php index a91d045..04ac908 100755 --- a/usr/local/www/interfaces_qinq.php +++ b/usr/local/www/interfaces_qinq.php @@ -147,7 +147,7 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong></span> <?php printf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?></p> </td> diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index 1206d20..0b87a40 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -131,7 +131,7 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong></span> <?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p> </td> diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php index 826547c..6c9a53c 100755 --- a/usr/local/www/load_balancer_monitor_edit.php +++ b/usr/local/www/load_balancer_monitor_edit.php @@ -139,7 +139,7 @@ if ($_POST) { if(isset($id) && $a_monitor[$id]) $monent = $a_monitor[$id]; if($monent['name'] != "") - $changedesc .= " " . sprintf(gettext("modified '%s' monitor"), $monent['name']) . ":"; + $changedesc .= " " . sprintf(gettext("modified '%s' monitor:"), $monent['name']); update_if_changed("name", $monent['name'], $pconfig['name']); update_if_changed("type", $monent['type'], $pconfig['type']); diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 818521f..92453b9 100755 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -176,8 +176,8 @@ function clearcombo(){ <td width="22%" valign="top" class="vncellreq"><?=gettext("Mode"); ?></td> <td width="78%" class="vtable" colspan="2"> <select id="mode" name="mode" onChange="enforceFailover(); checkPoolControls();"> - <option value="loadbalance" <?if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "selected";?>>Load Balance</option> - <option value="failover" <?if($pconfig['mode'] == "failover") echo "selected";?>>Manual Failover</option> + <option value="loadbalance" <?if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "selected";?>><?=gettext("Load Balance");?></option> + <option value="failover" <?if($pconfig['mode'] == "failover") echo "selected";?>><?=gettext("Manual Failover");?></option> </select> </td> </tr> @@ -192,7 +192,7 @@ function clearcombo(){ <td width="22%" valign="top" id="monitorport_text" class="vncellreq"><?=gettext("Port"); ?></td> <td width="78%" class="vtable" colspan="2"> <input name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="16" maxlength="16"><br> - <div id="monitorport_desc"><?=gettext("This is the port your servers are listening on"); ?>.</div> + <div id="monitorport_desc"><?=gettext("This is the port your servers are listening on."); ?></div> </td> </tr> <tr> @@ -217,7 +217,7 @@ function clearcombo(){ } ?> <?php else: ?> - <b><?=gettext("NOTE"); ?>:</b> <?=gettext("Please add a monitor IP address on the monitors tab if you wish to use this feature"); ?>. + <b><?=gettext("NOTE"); ?>:</b> <?=gettext("Please add a monitor IP address on the monitors tab if you wish to use this feature."); ?> <?php endif; ?> </select> </td> diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index 247c42b..55d55a5 100755 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -96,9 +96,9 @@ if ($_POST) { if(isset($id) && $a_vs[$id]) $vsent = $a_vs[$id]; if($vsent['name'] != "") - $changedesc .= " " . sprintf(gettext("modified '%s' vs"), $vsent['name']) . ":"; + $changedesc .= " " . sprintf(gettext("modified '%s' vs:"), $vsent['name']); else - $changedesc .= " " . sprintf(gettext("created '%s' vs"), $_POST['name']) . ":"; + $changedesc .= " " . sprintf(gettext("created '%s' vs:"), $_POST['name']); update_if_changed("name", $vsent['name'], $_POST['name']); update_if_changed("desc", $vsent['desc'], $_POST['desc']); diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index e82440c..9e9b5d7 100755 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -167,7 +167,7 @@ switch($_GET['mode']) { update_status($_GET['pkg'] . " " . gettext("installation completed.")); update_output_window($status); } else { - update_output_window(gettext("Could not find") . " " . $_GET['pkg'] . "."); + update_output_window(sprintf(gettext("Could not find %s."), $_GET['pkg'])); } break; case "reinstallall": diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php index 99bf636..c3d0ce5 100644 --- a/usr/local/www/pkg_mgr_settings.php +++ b/usr/local/www/pkg_mgr_settings.php @@ -89,7 +89,7 @@ function enable_altpkgrepourl(enable_over) { <?php $version = file_get_contents("/etc/version"); $tab_array = array(); - $tab_array[] = array("{$version} " . gettext("packages"), false, "pkg_mgr.php"); + $tab_array[] = array(sprintf(gettext("%s packages"), $version), false, "pkg_mgr.php"); $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php"); $tab_array[] = array(gettext("Package Settings"), true, "pkg_mgr_settings.php"); display_top_tabs($tab_array); @@ -106,7 +106,7 @@ function enable_altpkgrepourl(enable_over) { <td class="vtable"> <input name="alturlenable" type="checkbox" id="alturlenable" value="yes" onClick="enable_altpkgrepourl()" <?php if(isset($curcfg['enable'])) echo "checked"; ?>> <?=gettext("Use a different URL server for packages other than");?> <?php echo $g['product_website']; ?><br> <table> - <tr><td><?=gettext("Base URL");?>:</td><td><input name="pkgrepourl" type="input" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>"></td></tr> + <tr><td><?=gettext("Base URL:");?></td><td><input name="pkgrepourl" type="input" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>"></td></tr> </table> <span class="vexpl"> <?=printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed");?>. diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php index 839a18e..0a6b50d 100755 --- a/usr/local/www/progress.php +++ b/usr/local/www/progress.php @@ -12,7 +12,7 @@ else $url = 'progress.php?UPLOAD_IDENTIFIER='. $_GET["UPLOAD_IDENTIFIER"] .'&e=1'; function nice_value($x) { - if ($x < 100) $x; + if ($x < 100) return $x; if ($x < 10000) return sprintf("%.2fKB", $x/1000); if ($x < 900000) return sprintf("%dKB", $x/1000); return sprintf("%.2fMB", $x/1000/1000); @@ -27,6 +27,7 @@ if (!$X) { }else{ echo ('<HTML><meta HTTP-EQUIV="Refresh" CONTENT="1; url='. $url .'"><BODY></BODY></HTML>'); } + exit; } else { @@ -43,7 +44,9 @@ if (!$X) { if ($X['bytes_total'] > 1 && $X['bytes_uploaded'] >= $X['bytes_total'] && $X['est_sec'] == 0) { echo ('<HTML><BODY onLoad="window.close()"> ' . gettext("UPLOAD completed") . '!</BODY></HTML>'); - } else { + exit; + } +} ?> @@ -52,7 +55,7 @@ if (!$X) { <meta HTTP-EQUIV="Refresh" CONTENT="1; url=<?=$url?>"> -<TITLE><?=gettext("Uploading Files"); ?>... <?=gettext("Please wait"); ?> ...</TITLE> +<TITLE><?=gettext("Uploading Files... Please wait..."); ?></TITLE> <style type='text/css'> td {font-size: 10pt }</style> @@ -62,7 +65,7 @@ if (!$X) { <table height="100%" width="100%" cellPadding="4" cellSpacing="4" style="border:1px solid #990000;"> <tr><td> - <font face="arial"><b><center><?=gettext("Uploading files");?>...</b></center> + <font face="arial"><b><center><?=gettext("Uploading files...");?></b></center> <br> @@ -70,7 +73,7 @@ if (!$X) { <td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" align="top"></td> <td> <table WIDTH="100%" height="15" colspacing="0" cellpadding="0" cellspacing="0" border="0" align="top" nowrap> - <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif"><?echo("<img src='./themes/".$g['theme']."/images/misc/bar_blue.gif' height='15' WIDTH='$meter%'>");?></td> + <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif"><?php echo("<img src='./themes/".$g['theme']."/images/misc/bar_blue.gif' height='15' WIDTH='$meter%'>");?></td> </table> </td> @@ -81,17 +84,17 @@ if (!$X) { <TABLE WIDTH="100%"> <tr> - <td align="right"><font face="arial"><b><?=gettext("Time Remaining");?>:</td><td><font face="arial"><?=$eta?></td> + <td align="right"><font face="arial"><b><?=gettext("Time Remaining:");?></td><td><font face="arial"><?=$eta?></td> <td align="right"><font face="arial"><b><?=gettext("Speed:");?></td><td><font face="arial"><font face="arial"><?=$speed?><?=gettext("KB/sec");?></td> </tr> <tr> - <td align="right"><font face="arial"><b><?=gettext("Uploaded");?>:</td><td><font face="arial"><?=$upl?></td> - <td align="right"><font face="arial"><b><?=gettext("File Size");?>:</td><td><font face="arial"><?=$total?></td> + <td align="right"><font face="arial"><b><?=gettext("Uploaded:");?></td><td><font face="arial"><?=$upl?></td> + <td align="right"><font face="arial"><b><?=gettext("File Size:");?></td><td><font face="arial"><?=$total?></td> </tr> <tr> - <td align="right"><font face="arial"><b><?=gettext("Completed");?>:</td><td><font face="arial"><?=$meter?>%</td> + <td align="right"><font face="arial"><b><?=gettext("Completed:");?></td><td><font face="arial"><?=$meter?>%</td> <td align="right"><font face="arial"><b></td><td><font face="arial"></td> </tr> @@ -100,6 +103,3 @@ if (!$X) { </BODY> </HTML> - - - diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 5af06ba..08adf7d 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -321,7 +321,7 @@ function enable_change(enable_change) { </option> <?php endforeach; ?> </select> <br> - <span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal"); ?>.</span></td> + <span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal."); ?></span></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Maximum concurrent connections"); ?></td> @@ -334,28 +334,28 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client </table> <?=gettext("This setting limits the number of concurrent connections to the captive portal HTTP(S) server. This does not set how many users can be logged in " . "to the captive portal, but rather how many users can load the portal page or authenticate at the same time! " . -"Default is 4 connections per client IP address, with a total maximum of 16 connections"); ?>.</td> +"Default is 4 connections per client IP address, with a total maximum of 16 connections."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td> <td class="vtable"> <input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="6" value="<?=htmlspecialchars($pconfig['idletimeout']);?>"> <?=gettext("minutes"); ?><br> -<?=gettext("Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout"); ?>.</td> +<?=gettext("Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Hard timeout"); ?></td> <td width="78%" class="vtable"> <input name="timeout" type="text" class="formfld unknown" id="timeout" size="6" value="<?=htmlspecialchars($pconfig['timeout']);?>"> <?=gettext("minutes"); ?><br> - <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)"); ?>.</td> + <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Logout popup window"); ?></td> <td width="78%" class="vtable"> <input name="logoutwin_enable" type="checkbox" class="formfld" id="logoutwin_enable" value="yes" <?php if($pconfig['logoutwin_enable']) echo "checked"; ?>> <strong><?=gettext("Enable logout popup window"); ?></strong><br> - <?=gettext("If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs"); ?>.</td> + <?=gettext("If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Redirection URL"); ?></td> @@ -363,14 +363,14 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <input name="redirurl" type="text" class="formfld url" id="redirurl" size="60" value="<?=htmlspecialchars($pconfig['redirurl']);?>"> <br> <?=gettext("If you provide a URL here, clients will be redirected to that URL instead of the one they initially tried " . -"to access after they've authenticated"); ?>.</td> +"to access after they've authenticated."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Concurrent user logins"); ?></td> <td class="vtable"> <input name="noconcurrentlogins" type="checkbox" class="formfld" id="noconcurrentlogins" value="yes" <?php if ($pconfig['noconcurrentlogins']) echo "checked"; ?>> <strong><?=gettext("Disable concurrent logins"); ?></strong><br> - <?=gettext("If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected"); ?>.</td> + <?=gettext("If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("MAC filtering"); ?> </td> @@ -378,22 +378,22 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <input name="nomacfilter" type="checkbox" class="formfld" id="nomacfilter" value="yes" <?php if ($pconfig['nomacfilter']) echo "checked"; ?>> <strong><?=gettext("Disable MAC filtering"); ?></strong><br> <?=gettext("If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in." . - "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)"); ?>. - <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used"); ?>.</td> + "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)."); ?> + <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Pass-through MAC Auto Entry"); ?></td> <td class="vtable"> <input name="passthrumacadd" type="checkbox" class="formfld" id="passthrumacadd" value="yes" <?php if ($pconfig['passthrumacadd']) echo "checked"; ?>> <strong><?=gettext("Enable Pass-through MAC automatic additions"); ?></strong><br> - <?=gettext("If this option is set, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will never have to authenticate again"); ?>. - <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it"); ?>. - <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown"); ?>. + <?=gettext("If this option is set, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will never have to authenticate again."); ?> + <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?> + <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown."); ?> <br/><br/> <input name="passthrumacaddusername" type="checkbox" class="formfld" id="passthrumacaddusername" value="yes" <?php if ($pconfig['passthrumacaddusername']) echo "checked"; ?>> <strong><?=gettext("Enable Pass-through MAC automatic addition with username"); ?></strong><br> - <?=gettext("If this option is set, with the automatically MAC passthrough entry created the username, used during authentication, will be saved"); ?>. - <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it"); ?>. + <?=gettext("If this option is set, with the automatically MAC passthrough entry created the username, used during authentication, will be saved."); ?> + <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?> </td> </tr> <tr> @@ -411,7 +411,7 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <td><input type="text" class="formfld unknown" name="bwdefaultup" id="bwdefaultup" size="10" value="<?=htmlspecialchars($pconfig['bwdefaultup']);?>"> <?=gettext("Kbit/s"); ?></td> </tr></table> <br> - <?=gettext("If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit"); ?>. </td> + <?=gettext("If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit."); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Authentication"); ?></td> @@ -440,17 +440,17 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <tr> <td class="vncell" valign="top"><?=gettext("IP address"); ?></td> <td class="vtable"><input name="radiusip" type="text" class="formfld unknown" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"><br> - <?=gettext("Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against"); ?>.</td> + <?=gettext("Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Port"); ?></td> <td class="vtable"><input name="radiusport" type="text" class="formfld unknown" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"><br> - <?=gettext("Leave this field blank to use the default port (1812)"); ?>.</td> + <?=gettext("Leave this field blank to use the default port (1812)."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Shared secret"); ?> </td> <td class="vtable"><input name="radiuskey" type="text" class="formfld unknown" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"><br> - <?=gettext("Leave this field blank to not use a RADIUS shared secret (not recommended)"); ?>.</td> + <?=gettext("Leave this field blank to not use a RADIUS shared secret (not recommended)."); ?></td> </tr> <tr> <td colspan="2" class="list" height="12"></td> @@ -461,7 +461,7 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <tr> <td class="vncell" valign="top"><?=gettext("IP address"); ?></td> <td class="vtable"><input name="radiusip2" type="text" class="formfld unknown" id="radiusip2" size="20" value="<?=htmlspecialchars($pconfig['radiusip2']);?>"><br> - <?=gettext("If you have a second RADIUS server, you can activate it by entering its IP address here"); ?>.</td> + <?=gettext("If you have a second RADIUS server, you can activate it by entering its IP address here."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Port"); ?></td> @@ -482,12 +482,12 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vncell"> </td> <td class="vtable"><input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['radacct_enable']) echo "checked"; ?>> <strong><?=gettext("send RADIUS accounting packets"); ?></strong><br> - <?=gettext("If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server"); ?>.</td> + <?=gettext("If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Accounting port"); ?></td> <td class="vtable"><input name="radiusacctport" type="text" class="formfld unknown" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"><br> - <?=gettext("Leave blank to use the default port (1813)"); ?>.</td> + <?=gettext("Leave blank to use the default port (1813)."); ?></td> </tr> <tr> <td colspan="2" class="list" height="12"></td> @@ -500,7 +500,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>> <strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br> <?=gettext("If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is " . - "logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately"); ?>.</td> + "logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Accounting updates"); ?></td> @@ -521,7 +521,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vtable"> <input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong><?=gettext("Enable RADIUS MAC authentication"); ?></strong><br> <?=gettext("If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password " . - "entered below to the RADIUS server"); ?>.</td> + "entered below to the RADIUS server."); ?></td> </tr> <tr> <td class="vncell"><?=gettext("Shared secret"); ?></td> @@ -565,14 +565,14 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> } ?> </select><br/> - <?=gettext("Choose the ip to use for calling station attribute"); ?>. + <?=gettext("Choose the ip to use for calling station attribute."); ?> </td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Session-Timeout"); ?></td> <td class="vtable"><input name="radiussession_timeout" type="checkbox" id="radiussession_timeout" value="yes" <?php if ($pconfig['radiussession_timeout']) echo "checked"; ?>><strong><?=gettext("Use RADIUS Session-Timeout attributes"); ?></strong><br> - <?=gettext("When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute"); ?>.</td> + <?=gettext("When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute."); ?></td> </tr> <tr> @@ -588,8 +588,9 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> echo "<option value=\"$radiusvendor\">$radiusvendor</option>\n"; } ?></select><br> - <?=gettext("If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and " . - "the Called-Station-Id to the client's MAC address. Default behavior is Calling-Station-Id = client's MAC address and Called-Station-Id"); ?> = <?=$g['product_name']?>'s <?=gettext("WAN IP address"); ?>.</td> + <?=printf(gettext("If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and " . + "the Called-Station-Id to the client's MAC address. Default behavior is Calling-Station-Id = client's MAC address and Called-Station-Id = %s WAN IP address."), + $g['product_name']);?></td> </tr> </table> </tr> @@ -609,46 +610,46 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> ?> </select></br> <?=gettext("This option changes the MAC address format used in the whole RADIUS system. Change this if you also"); ?> - <?=gettext("need to change the username format for RADIUS MAC authentication"); ?>.<br> - <?=gettext("default"); ?>: 00:11:22:33:44:55<br> - <?=gettext("singledash"); ?>: 001122-334455<br> - <?=gettext("ietf"); ?>: 00-11-22-33-44-55<br> - <?=gettext("cisco"); ?>: 0011.2233.4455<br> - <?=gettext("unformatted"); ?>: 001122334455 + <?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br> + <?=gettext("default:"); ?> 00:11:22:33:44:55<br> + <?=gettext("singledash:"); ?> 001122-334455<br> + <?=gettext("ietf:"); ?> 00-11-22-33-44-55<br> + <?=gettext("cisco:"); ?> 0011.2233.4455<br> + <?=gettext("unformatted:"); ?> 001122334455 </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS login"); ?></td> <td class="vtable"> <input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>> <strong><?=gettext("Enable HTTPS login"); ?></strong><br> - <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below"); ?>.</td> + <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td> <td class="vtable"> <input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br> - <?=gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on"); ?> <?=$g['product_name']?>. </td> + <?=printf(gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on %s."), $g['product_name']);?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS certificate"); ?></td> <td class="vtable"> <textarea name="cert" cols="65" rows="7" id="cert" class="formpre"><?=htmlspecialchars($pconfig['cert']);?></textarea> <br> - <?=gettext("Paste a signed certificate in X.509 PEM format here"); ?>.</td> + <?=gettext("Paste a signed certificate in X.509 PEM format here."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS private key"); ?></td> <td class="vtable"> <textarea name="key" cols="65" rows="7" id="key" class="formpre"><?=htmlspecialchars($pconfig['key']);?></textarea> <br> - <?=gettext("Paste an RSA private key in PEM format here"); ?>.</td> + <?=gettext("Paste an RSA private key in PEM format here."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS intermediate certificate"); ?></td> <td class="vtable"> <textarea name="cacert" cols="65" rows="7" id="cacert" class="formpre"><?=htmlspecialchars($pconfig['cacert']);?></textarea> <br> - <?=gettext("Paste a certificate in X.509 PEM format here"); ?>.</td> + <?=gettext("Paste a certificate in X.509 PEM format here."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Portal page contents"); ?></td> @@ -667,10 +668,20 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <br> <?php endif; ?> - <?=gettext("Upload an HTML/PHP file for the portal page here (leave blank to keep the current one). Make sure to include a form (POST to"); ?> "$PORTAL_ACTION$") -<?=gettext("with a submit button"); ?> (name="accept") <?=gettext("and a hidden field with"); ?> name="redirurl" <?=gettext("and"); ?> value="$PORTAL_REDIRURL$". -<?=gettext("Include the"); ?> "auth_user" <?=gettext("and"); ?> "auth_pass" <?=gettext("and/or"); ?> "auth_voucher" <?=gettext("input fields if authentication is enabled, otherwise it will always fail"); ?>. -<?=gettext("Example code for the form"); ?>:<br> + <?= + printf( + gettext("Upload an HTML/PHP file for the portal page here (leave blank to keep the current one). " . + "Make sure to include a form (POST to %s) with a submit button (%s) and a hidden field with %s and %s. " . + "Include the %s and %s and/or %s input fields if authentication is enabled, otherwise it will always fail."), + ""{$PORTAL_ACTION}"", + "name="accept"", + "name="redirurl"", + "value="{$PORTAL_REDIRURL}"", + ""auth_user"", + ""auth_pass"", + ""auth_voucher""); + ?> + <?=gettext("Example code for the form:"); ?><br> <br> <tt><form method="post" action="$PORTAL_ACTION$"><br> <input name="auth_user" type="text"><br> @@ -692,7 +703,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <?php endif; ?> <?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " . -"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any"); ?>.</td> +"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Logout"); ?><br> @@ -706,7 +717,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <?php endif; ?> <?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " . -"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any"); ?>.</td> +"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td> </tr> <tr> <td width="22%" valign="top"> </td> @@ -716,8 +727,8 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br> - </strong></span><?=gettext("Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work"); ?>. </span></td> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br> + </strong></span><?=gettext("Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work."); ?> </span></td> </tr> </table> </td> diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index 9e99395..59aac37 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -199,21 +199,21 @@ include("head.inc"); <?php endif; ?> </table> <span class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> <?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " . "be made available in the root directory of the captive portal HTTP(S) server. " . "You may reference them directly from your portal page HTML code using relative paths. " . "Example: you've uploaded an image with the name 'captiveportal-test.jpg' using the " . - "file manager. Then you can include it in your portal page like this"); ?>:<br><br> + "file manager. Then you can include it in your portal page like this:"); ?><br><br> <tt><img src="captiveportal-test.jpg" width=... height=...></tt> <br><br> <?=gettext("In addition, you can also upload .php files for execution. You can pass the filename " . - "to your custom page from the initial page by using text similar to"); ?>: + "to your custom page from the initial page by using text similar to:"); ?> <br><br> <tt><a href="/captiveportal-aup.php?redirurl=$PORTAL_REDIRURL$"><?=gettext("Acceptable usage policy"); ?></a></tt> <br><br> - <?=gettext("The total size limit for all files is"); ?> <?=format_bytes($g['captiveportal_element_sizelimit']);?>.</span> + <?=printf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']));?></span> </td> </tr> </table> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 2eedce3..25615e6 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -154,9 +154,9 @@ include("head.inc"); </tr> <tr> <td colspan="2" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying"); ?> <em><?=gettext("from"); ?></em> <?=gettext("addresses, it may be used to always allow pass-through access from a client behind the captive portal"); ?>.</p> + <?=gettext("Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal."); ?></p> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><span class="vexpl"><?=gettext("any"); ?> <img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"> x.x.x.x </span></td> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index fd2193c..bbcd217 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -165,9 +165,9 @@ include("head.inc"); </tr> <tr> <td colspan="2" class="list"><span class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("Adding MAC addresses as pass-through MACs allows them access through the captive portal automatically without being taken to the portal page"); ?>. </span></td> + <?=gettext("Adding MAC addresses as pass-through MACs allows them access through the captive portal automatically without being taken to the portal page."); ?> </span></td> <td class="list"> </td> </tr> </table> diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php index c6cf3e9..2450fd2 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -310,9 +310,9 @@ function enable_change(enable_change) { "captive portal for the configured time. Once a voucher is activated, " . "its clock is started and runs uninterrupted until it expires. During that " . "time, the voucher can be re-used from the same or a different computer. If the voucher " . -"is used again from another computer, the previous session is stopped"); ?>. +"is used again from another computer, the previous session is stopped."); ?> <?php else: ?> -<?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom"); ?>.</td> +<?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom."); ?></td> <?php endif;?> </tr> <tr> @@ -320,56 +320,56 @@ function enable_change(enable_change) { <td class="vtable"> <textarea name="publickey" cols="65" rows="4" id="publickey" class="formpre"><?=htmlspecialchars($pconfig['publickey']);?></textarea> <br> - <?=gettext("Paste an RSA public key (64 Bit or smaller) in PEM format here. This key is used to decrypt vouchers"); ?>.</td> + <?=gettext("Paste an RSA public key (64 Bit or smaller) in PEM format here. This key is used to decrypt vouchers."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Voucher private key"); ?></td> <td class="vtable"> <textarea name="privatekey" cols="65" rows="5" id="privatekey" class="formpre"><?=htmlspecialchars($pconfig['privatekey']);?></textarea> <br> - <?=gettext("Paste an RSA private key (64 Bit or smaller) in PEM format here. This key is only used to generate encrypted vouchers and doesn't need to be available if the vouchers have been generated offline"); ?>.</td> + <?=gettext("Paste an RSA private key (64 Bit or smaller) in PEM format here. This key is only used to generate encrypted vouchers and doesn't need to be available if the vouchers have been generated offline."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Character set"); ?></td> <td width="78%" class="vtable"> <input name="charset" type="text" class="formfld" id="charset" size="80" value="<?=htmlspecialchars($pconfig['charset']);?>"> <br> - <?=gettext("Tickets are generated with the specified character set. It should contain printable characters (numbers, lower case and upper case letters) that are hard to confuse with others. Avoid e.g. 0/O and l/1"); ?>.</td> + <?=gettext("Tickets are generated with the specified character set. It should contain printable characters (numbers, lower case and upper case letters) that are hard to confuse with others. Avoid e.g. 0/O and l/1."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Roll Bits"); ?></td> <td width="78%" class="vtable"> <input name="rollbits" type="text" class="formfld" id="rollbits" size="2" value="<?=htmlspecialchars($pconfig['rollbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store the Roll# it belongs to. Allowed range: 1..31. Sum of Roll+Ticket+Checksum bits must be one Bit less than the RSA key size"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store the Roll# it belongs to. Allowed range: 1..31. Sum of Roll+Ticket+Checksum bits must be one Bit less than the RSA key size."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Ticket Bits"); ?></td> <td width="78%" class="vtable"> <input name="ticketbits" type="text" class="formfld" id="ticketbits" size="2" value="<?=htmlspecialchars($pconfig['ticketbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store the Ticket# it belongs to. Allowed range: 1..16. Using 16 bits allows a roll to have up to 65535 vouchers. A bit array, stored in RAM and in the config, is used to mark if a voucher has been used. A bit array for 65535 vouchers requires 8 KB of storage"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store the Ticket# it belongs to. Allowed range: 1..16. Using 16 bits allows a roll to have up to 65535 vouchers. A bit array, stored in RAM and in the config, is used to mark if a voucher has been used. A bit array for 65535 vouchers requires 8 KB of storage."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Checksum Bits"); ?></td> <td width="78%" class="vtable"> <input name="checksumbits" type="text" class="formfld" id="checksumbits" size="2" value="<?=htmlspecialchars($pconfig['checksumbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store a simple checksum over Roll# and Ticket#. Allowed range is 0..31"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store a simple checksum over Roll# and Ticket#. Allowed range is 0..31."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Magic Number"); ?></td> <td width="78%" class="vtable"> <input name="magic" type="text" class="formfld" id="magic" size="20" value="<?=htmlspecialchars($pconfig['magic']);?>"> <br> - <?=gettext("Magic number stored in every voucher. Verified during voucher check. Size depends on how many bits are left by Roll+Ticket+Checksum bits. If all bits are used, no magic number will be used and checked"); ?>.</td> + <?=gettext("Magic number stored in every voucher. Verified during voucher check. Size depends on how many bits are left by Roll+Ticket+Checksum bits. If all bits are used, no magic number will be used and checked."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Save Interval"); ?></td> <td width="78%" class="vtable"> <input name="saveinterval" type="text" class="formfld" id="saveinterval" size="4" value="<?=htmlspecialchars($pconfig['saveinterval']);?>"> <?=gettext("Minutes"); ?><br> - <?=gettext("The list of active and used vouchers can be stored in the system's configuration file once every x minutes to survive power outages. No save is done if no new vouchers have been activated. Enter 0 to never write runtime state to XML config"); ?>.</td> + <?=gettext("The list of active and used vouchers can be stored in the system's configuration file once every x minutes to survive power outages. No save is done if no new vouchers have been activated. Enter 0 to never write runtime state to XML config."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Invalid Voucher Message"); ?></td> @@ -391,8 +391,8 @@ function enable_change(enable_change) { </tr> <tr> <td colspan="2" class="list"><p class="vexpl"> - <span class="red"><strong> <?=gettext("Note"); ?>:<br> </strong></span> - <?=gettext("Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings"); ?>. + <span class="red"><strong> <?=gettext("Note:"); ?><br> </strong></span> + <?=gettext("Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings."); ?> </p> </td> </tr> diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 3a0502c..086e38d 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -623,8 +623,8 @@ include("head.inc"); <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"> <?=gettext("seconds");?><br> <?=gettext("This is used for clients that do not ask for a specific " . - "expiration time"); ?>.<br> - <?=gettext("The default is 7200 seconds");?>. + "expiration time."); ?><br> + <?=gettext("The default is 7200 seconds.");?> </td> </tr> <tr> @@ -633,12 +633,12 @@ include("head.inc"); <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"> <?=gettext("seconds");?><br> <?=gettext("This is the maximum lease time for clients that ask". - " for a specific expiration time"); ?>.<br> - <?=gettext("The default is 86400 seconds");?>. + " for a specific expiration time."); ?><br> + <?=gettext("The default is 86400 seconds.");?> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP");?>:</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td> <td width="78%" class="vtable"> <input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br> <?=gettext("Leave blank to disable. Enter the interface IP address of the other machine. Machines must be using CARP.");?> @@ -657,7 +657,7 @@ include("head.inc"); <tr> <td> </td> <td> - <span class="red"><strong><?=gettext("Note");?>:</strong></span> <?=gettext("Only the machines listed below will be able to communicate with the firewall on this NIC.");?> + <span class="red"><strong><?=gettext("Note:");?></strong></span> <?=gettext("Only the machines listed below will be able to communicate with the firewall on this NIC.");?> </td> </tr> </table> @@ -674,8 +674,8 @@ include("head.inc"); <b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br /> <p> <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br /> - <?=gettext("Note: Leave blank to disable dynamic DNS registration");?>.<br /> - <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server");?>. + <?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br /> + <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?> </div> </td> </tr> @@ -805,14 +805,14 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " . "General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " . "forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " . - "be assigned to clients by the DHCP server"); ?>.<br> + "be assigned to clients by the DHCP server."); ?><br> <br> <?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " . - "DHCP leases"); ?></a> <?=gettext("page"); ?>.<br> + "DHCP leases"); ?></a> <?=gettext("page."); ?><br> </span></p> </td> </tr> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 910065b..4535f6b 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -156,7 +156,7 @@ function enable_change(enable_over) { </td> </tr> <tr> - <td><p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td><p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP". " service (if enabled) will automatically serve the LAN IP". " address as a DNS server to DHCP clients so they will use". diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index b9d2e01..d591a20 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -157,7 +157,7 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong></span> <?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?> </td> diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php index bf3c207..24c0267 100644 --- a/usr/local/www/services_dyndns_edit.php +++ b/usr/local/www/services_dyndns_edit.php @@ -180,7 +180,7 @@ include("head.inc"); <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>"> <br> <span class="vexpl"> - <span class="red"><strong><?=gettext("Note");?>:<br></strong> + <span class="red"><strong><?=gettext("Note:");?><br></strong> </span> <?=gettext("Enter the complete host/domain name. example: myhost.dyndns.org");?> </span> @@ -232,7 +232,7 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem: General setup%s or allow the DNS server list to be overridden by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">','</a>');?></span></td> diff --git a/usr/local/www/services_igmpproxy.php b/usr/local/www/services_igmpproxy.php index 4fc531d..2fb5cdd 100755 --- a/usr/local/www/services_igmpproxy.php +++ b/usr/local/www/services_igmpproxy.php @@ -158,7 +158,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="4"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?></span></p> </td> </tr> </table> diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php index df0ea47..d11278c 100644 --- a/usr/local/www/services_rfc2136_edit.php +++ b/usr/local/www/services_rfc2136_edit.php @@ -205,7 +205,7 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem: " . "General setup %sor allow the DNS server list to be overridden " . "by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">', '</a>');?></span></td> diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 800f585..128fc3f 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -209,7 +209,7 @@ include("head.inc"); <span class="vexpl"> <span class="red"> <strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong> </span><?=gettext("This service can be used to wake up (power on) computers by sending special"); ?> "<?=gettext("Magic Packets"); ?>". <?=gettext("The NIC in the computer that is to be woken up must support Wake on LAN and has to be configured properly (WOL cable, BIOS settings). ");?> </span> diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index e12b20c..292b9ea 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -116,7 +116,7 @@ if ($_GET['order']) { </td></tr> <tr> <td class="tabcont"> -<? endif; ?> +<?php endif; ?> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php index e4ae38b..28e6220 100755 --- a/usr/local/www/status_rrd_graph.php +++ b/usr/local/www/status_rrd_graph.php @@ -323,7 +323,7 @@ function get_dates($curperiod, $graph) { </tr> <tr> <td colspan="2" class="list"> - <?=gettext("Graphs");?>: + <?=gettext("Graphs:");?> <select name="option" class="formselect" style="z-index: -10;" onchange="document.form1.submit()"> <?php @@ -375,7 +375,7 @@ function get_dates($curperiod, $graph) { ?> </select> - <?=gettext("Style");?>: + <?=gettext("Style:");?> <select name="style" class="formselect" style="z-index: -10;" onchange="document.form1.submit()"> <?php foreach ($styles as $style => $styled) { @@ -386,10 +386,10 @@ function get_dates($curperiod, $graph) { ?> </select> - <? + <?php if($curcat <> "custom") { ?> - <?=gettext("Period");?>: + <?=gettext("Period:");?> <select name="period" class="formselect" style="z-index: -10;" onchange="document.form1.submit()"> <?php foreach ($periods as $period => $value) { @@ -409,7 +409,7 @@ function get_dates($curperiod, $graph) { <?=gettext("End:");?> <input type="text" name="end" class="formfldunknown" length="32" value="<?php echo $now;?>"> <input type="submit" name="Submit" value="<?=gettext("Go"); ?>"> - <? + <?php $curdatabase = $curoption; $graph = "custom-$curdatabase"; if(in_array($curdatabase, $databases)) { diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index b8af888..4cdf065 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -240,7 +240,7 @@ function prot_change() { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE"); ?>: </strong> + <strong><?=gettext("NOTE:"); ?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index 1fe923d..0a944a9 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -212,7 +212,7 @@ function update_description(itemnum) { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE");?>: </strong> + <strong><?=gettext("NOTE:");?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only.");?> <br/> @@ -289,7 +289,7 @@ function update_description(itemnum) { <br/> <strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong> <br/> - <span class="vexpl"><?=gettext("Note: Leave this blank for the default. On your system the default size is");?>: <?= pfsense_default_state_size() ?></span> + <span class="vexpl"><?=gettext("Note: Leave this blank for the default. On your system the default size is:");?> <?= pfsense_default_state_size() ?></span> </td> </tr> <tr> @@ -302,7 +302,7 @@ function update_description(itemnum) { <span class="vexpl"> <?=gettext("Note: Leave this blank for the default.");?> <?php if (empty($pconfig['maximumtableentries'])): ?> - <?= gettext("On your system the default size is");?>: <?= pfsense_default_table_entries_size(); ?> + <?= gettext("On your system the default size is:");?> <?= pfsense_default_table_entries_size(); ?> <?php endif; ?> </span> </td> diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 1bd5cbf..e17f775 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -162,7 +162,7 @@ function maxmss_checked(obj) { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE"); ?>: </strong> + <strong><?=gettext("NOTE:"); ?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 8884797..e8a2b64 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -194,7 +194,7 @@ function enable_change(enable_over) { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE"); ?>: </strong> + <strong><?=gettext("NOTE:"); ?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php index 4e097ca..0a27bdd 100644 --- a/usr/local/www/system_advanced_sysctl.php +++ b/usr/local/www/system_advanced_sysctl.php @@ -162,7 +162,7 @@ include("head.inc"); <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE"); ?>: </strong> + <strong><?=gettext("NOTE:"); ?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> @@ -226,7 +226,7 @@ include("head.inc"); </div> </td> </tr> - <? else: ?> + <?php else: ?> <tr> <td> <div id="mainarea"> @@ -268,7 +268,7 @@ include("head.inc"); </div> </td> </tr> - <? endif; ?> + <?php endif; ?> </table> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index 698a6be..fc7cef0 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -511,7 +511,7 @@ function select_clicked() { <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="2"> <tr> - <td><?=gettext("Level");?>: </td> + <td><?=gettext("Level:");?> </td> <td> <select name='ldap_scope' id='ldap_scope' class="formselect"> <?php @@ -526,7 +526,7 @@ function select_clicked() { </td> </tr> <tr> - <td><?=gettext("Base DN");?>: </td> + <td><?=gettext("Base DN:");?> </td> <td> <input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/> </td> @@ -540,7 +540,7 @@ function select_clicked() { <td width="78%" class="vtable"> <table border="0" cellspacing="0" cellpadding="2"> <tr> - <td><?=gettext("Containers");?>: </td> + <td><?=gettext("Containers:");?> </td> <td> <input name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/> <input type="button" onClick="select_clicked();" value="<?=gettext("Select");?>"> @@ -570,13 +570,13 @@ function select_clicked() { <td colspan="2"></td> </tr> <tr> - <td><?=gettext("User DN");?>: </td> + <td><?=gettext("User DN:");?> </td> <td> <input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/> </td> </tr> <tr> - <td><?=gettext("Password");?>: </td> + <td><?=gettext("Password:");?> </td> <td> <input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/> </td> @@ -749,11 +749,11 @@ ldap_bindchange(); ldap_urlchange(); <?php if (!isset($id)): ?> ldap_tmplchange(); -<? endif; ?> -<? endif; ?> +<?php endif; ?> +<?php endif; ?> <?php if (!isset($id) || $pconfig['type'] == "radius"): ?> radius_srvcschange(); -<? endif; ?> +<?php endif; ?> //--> </script> </body> diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 7aae43e..369f7b6 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -81,8 +81,7 @@ if ($act == "del") { $name = $a_ca[$id]['name']; unset($a_ca[$id]); write_config(); - $savemsg = gettext("Certificate Authority")." {$name} ". - gettext("successfully deleted")."<br/>"; + $savemsg = sprintf(gettext("Certificate Authority %s successfully deleted"), $name) . "<br/>"; } if ($act == "new") { @@ -248,7 +247,7 @@ function method_change() { <td id="mainarea"> <div class="tabcont"> - <?php if ($act == "new" || $act == gettext("save") || $input_errors): ?> + <?php if ($act == "new" || $act == gettext("Save") || $input_errors): ?> <form action="system_camanager.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> @@ -323,14 +322,14 @@ function method_change() { <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> <?php endforeach; ?> </select> - <?=gettext(bits);?> + <?=gettext("bits");?> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> <td width="78%" class="vtable"> <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> - <?=gettext(days);?> + <?=gettext("days");?> </td> </tr> <tr> @@ -342,7 +341,7 @@ function method_change() { <td align="left"> <input name="dn_country" type="text" class="formfld unknown" maxlength="2" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("US");?> <em><?=gettext("( two letters )");?></em> @@ -353,7 +352,7 @@ function method_change() { <td align="left"> <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("Texas");?> </td> @@ -363,7 +362,7 @@ function method_change() { <td align="left"> <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("Austin");?> </td> @@ -373,7 +372,7 @@ function method_change() { <td align="left"> <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("My Company Inc.");?> </td> @@ -383,7 +382,7 @@ function method_change() { <td align="left"> <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("admin@mycompany.com");?> </td> @@ -393,7 +392,7 @@ function method_change() { <td align="left"> <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/> - <em>ex:</em> + <em><?=gettext("ex:");?></em> <?=gettext("internal-ca");?> </td> diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 683bdeb..4fd51e7 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -82,8 +82,7 @@ if ($act == "del") { $name = $a_cert[$id]['name']; unset($a_cert[$id]); write_config(); - $savemsg = gettext("Certificate")." {$name} ". - gettext("successfully deleted")."<br/>"; + $savemsg = sprintf(gettext("Certificate %s successfully deleted"), $name) . "<br/>"; } if ($act == "new") { @@ -754,10 +753,10 @@ function internalca_change() { <td class="listr"><?=$caname;?> </td> <td class="listr"><?=$subj;?> </td> <td valign="middle" nowrap class="list"> - <a href="system_certmanager.php?act=exp&id=<?=$i;?>")"> + <a href="system_certmanager.php?act=exp&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" /> </a> - <a href="system_certmanager.php?act=key&id=<?=$i;?>")"> + <a href="system_certmanager.php?act=key&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export key");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" /> </a> <a href="system_certmanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate?");?>')"> diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index eb8389f..93b6997 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -259,7 +259,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) <?php else: ?> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>"> <br><br> - <strong><?=gettext("Firmware image file");?>: </strong> + <strong><?=gettext("Firmware image file:");?> </strong> <input name="ulfile" type="file" class="formfld"> <br><br> <?php if ($g['platform'] == "nanobsd"): ?> @@ -296,7 +296,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning:");?><br> </strong></span><?=gettext("DO NOT abort the firmware upgrade once it " . "has started. The firewall will reboot automatically after " . "storing the new firmware. The configuration will be maintained.");?></span></td> diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index d09934c..e7c104e 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -133,12 +133,12 @@ function enable_altfirmwareurl(enable_over) { <td class="vtable"> <input name="alturlenable" type="checkbox" id="alturlenable" value="yes" onClick="enable_altfirmwareurl()" <?php if(isset($curcfg['alturl']['enable'])) echo "checked"; ?>> <?=gettext("Use a URL server for firmware upgrades other than") . " " . $g['product_website']; ?><br> <table> - <tr><td><?=gettext("Base URL"); ?>:</td><td><input name="firmwareurl" type="input" class="formfld url" id="firmwareurl" size="64" value="<?php if($curcfg['alturl']['firmwareurl']) echo $curcfg['alturl']['firmwareurl']; else echo $g['']; ?>"></td></tr> + <tr><td><?=gettext("Base URL:"); ?></td><td><input name="firmwareurl" type="input" class="formfld url" id="firmwareurl" size="64" value="<?php if($curcfg['alturl']['firmwareurl']) echo $curcfg['alturl']['firmwareurl']; else echo $g['']; ?>"></td></tr> </table> <span class="vexpl"> <?=gettext("This is where"); ?> <?php echo $g['product_name'] ?> <?=gettext("will check for newer firmware versions when the"); ?> <a href="system_firmware_check.php"><?=gettext("System: Firmware: Auto Update"); ?></a> <?=gettext("page is viewed."); ?> <p/> - <b><?=gettext("NOTE"); ?>:</b> <?=gettext("When a custom URL is enabled, the system will not verify the digital signature from"); ?> <?php echo $g['product_website'] ?>. + <b><?=gettext("NOTE:"); ?></b> <?=printf(gettext("When a custom URL is enabled, the system will not verify the digital signature from %s."), $g['product_website']) ?> </span> </td> </tr> diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index 37c5ec3..0097eb9 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -471,7 +471,7 @@ function presubmit() { </tr> </table> - <? endif; ?> + <?php endif; ?> </div> </td> diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 032a5c2..454e613 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -201,7 +201,7 @@ include("head.inc"); </tr> </table> </form> - <p><b><?=gettext("Note");?>:</b> <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?></p> + <p><b><?=gettext("Note:");?></b> <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?></p> <?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php index 313e7e1..345bf88 100755 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -184,7 +184,7 @@ include("head.inc"); ?> </select> <br /> <div id='addgwbox'> - <?=gettext("Choose which gateway this route applies to or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one");?></a>. + <?=gettext("Choose which gateway this route applies to or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one.");?></a> </div> <div id='notebox'> </div> @@ -196,14 +196,14 @@ include("head.inc"); <table bgcolor="#990000" cellpadding="1" cellspacing="1"> <tr><td> </td> <tr> - <td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway"); ?>:</b></center></td> + <td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway:"); ?></b></center></td> </tr> <tr><td> </td> <tr> - <td width="45%" align="right"><font color="white"><?=gettext("Default gateway"); ?>:</td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td> + <td width="45%" align="right"><font color="white"><?=gettext("Default gateway:"); ?></td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td> </tr> <tr> - <td width="45%" align="right"><font color="white"><?=gettext("Interface"); ?>:</td> + <td width="45%" align="right"><font color="white"><?=gettext("Interface:"); ?></td> <td><select name="addinterfacegw" id="addinterfacegw"> <?php $gwifs = get_configured_interface_with_descr(); foreach($gwifs as $fif => $dif) @@ -212,13 +212,13 @@ include("head.inc"); </select></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Gateway Name"); ?>:</td><td><input id="name" name="name" value="GW"></td> + <td align="right"><font color="white"><?=gettext("Gateway Name:"); ?></td><td><input id="name" name="name" value="GW"></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Gateway IP"); ?>:</td><td><input id="gatewayip" name="gatewayip"></td> + <td align="right"><font color="white"><?=gettext("Gateway IP:"); ?></td><td><input id="gatewayip" name="gatewayip"></td> </tr> <tr> - <td align="right"><font color="white"><?=gettext("Description"); ?>:</td><td><input id="gatewaydescr" name="gatewaydescr"></td> + <td align="right"><font color="white"><?=gettext("Description:"); ?></td><td><input id="gatewaydescr" name="gatewaydescr"></td> </tr> <tr><td> </td> <tr> @@ -242,7 +242,7 @@ include("head.inc"); <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td> <td width="78%" class="vtable"> <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> - <br> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span></td> + <br> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span></td> </tr> <tr> <td width="22%" valign="top"> </td> @@ -304,10 +304,10 @@ include("head.inc"); optn.value = value; selectbox.options.add(optn); selectbox.selectedIndex = (selectbox.options.length-1); - $('notebox').innerHTML="<p/><strong>NOTE:</strong> <?=gettext("You can manage Gateways"); ?> <a target='_new' href='system_gateways.php'>here</a>."; + $('notebox').innerHTML="<p/><strong><?=gettext("NOTE:");?></strong> <?=printf(gettext("You can manage Gateways %shere%s."), "<a target='_new' href='system_gateways.php'>", "</a>");?> } function report_failure() { - alert("<?=gettext("Sorry, we could not create your gateway at this time"); ?>."); + alert("<?=gettext("Sorry, we could not create your gateway at this time."); ?>"); hide_add_gateway(); } function save_callback(transport) { diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php index 7e656c5..e6b38c3 100644 --- a/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -96,7 +96,7 @@ function post_choices() { <p><?=gettext("Could not connect to the LDAP server. Please check your LDAP configuration.");?></p> <input type='button' value='<?=gettext("Close"); ?>' onClick="window.close();"> <?php else: ?> - <b><?=gettext("Please select which containers to Authenticate against");?>:</b> + <b><?=gettext("Please select which containers to Authenticate against:");?></b> <p/> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 5d20383..3cb6e4e 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -321,7 +321,7 @@ function enable_change(enable_over) { } ?> </select> - <br><?=gettext("Hint"); ?>: 24 <?=gettext("is"); ?> 255.255.255.0 + <br><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0 </td> </tr> <tr> @@ -338,7 +338,7 @@ function enable_change(enable_over) { } ?> </select> - <br><?=gettext("Hint"); ?>: 10 <?=gettext("is ten L2TP clients"); ?> + <br><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?> </td> </tr> <tr> @@ -402,7 +402,7 @@ function enable_change(enable_over) { <tr> <td colspan="2"> <span class="vexpl"> - <strong class="red"><?=gettext("Note");?>:</strong><br /> + <strong class="red"><?=gettext("Note:");?></strong><br /> <?=gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!");?> </span> </td> diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index 34710fc..1b6dc72 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -857,7 +857,7 @@ function autotls_change() { </tr> </table> - <? endif; ?> + <?php endif; ?> </td> </tr> diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 2426131..e23b202 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -721,7 +721,7 @@ function netbios_change() { </tr> </table> - <? endif; ?> + <?php endif; ?> </td> </tr> diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index c082b2e..02278fe 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -1264,7 +1264,7 @@ function netbios_change() { <?=gettext("Additional OpenVPN servers can be added here.");?> - <? endif; ?> + <?php endif; ?> </td> </tr> diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index 66ea9ea..ff6ded1 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -62,13 +62,13 @@ if($_POST['xml']) if(empty($xml)) { $xml = "not_defined"; - print_info_box_np(gettext("ERROR: Could not open") . " " . $xml . "."); + print_info_box_np(sprintf(gettext("ERROR: Could not open %s."), $xml)); die; } else { if (file_exists("{$g['www_path']}/wizards/{$xml}")) $pkg = parse_xml_config_pkg("{$g['www_path']}/wizards/" . $xml, "pfsensewizard"); else { - print_info_box_np(gettext("ERROR: Could not open") . " " . $xml . "."); + print_info_box_np(sprintf(gettext("ERROR: Could not open %s."), $xml)); die; } } |
