diff options
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/diag_logs_dhcp.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_logs_settings.php | 1 | ||||
-rw-r--r-- | usr/local/www/help.php | 2 | ||||
-rw-r--r-- | usr/local/www/pkg_edit.php | 2 | ||||
-rw-r--r-- | usr/local/www/services_dnsmasq.php | 4 | ||||
-rw-r--r-- | usr/local/www/shortcuts.inc | 2 | ||||
-rw-r--r-- | usr/local/www/shortcuts/pkg_upnp.inc | 2 | ||||
-rw-r--r-- | usr/local/www/status_gateways.php | 3 | ||||
-rw-r--r-- | usr/local/www/status_lb_vs.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_certmanager.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_crlmanager.php | 2 | ||||
-rwxr-xr-x | usr/local/www/system_firmware_auto.php | 12 | ||||
-rw-r--r-- | usr/local/www/system_firmware_check.php | 9 | ||||
-rw-r--r-- | usr/local/www/system_groupmanager_addprivs.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_usermanager.php | 24 | ||||
-rw-r--r-- | usr/local/www/system_usermanager_addprivs.php | 2 |
16 files changed, 50 insertions, 23 deletions
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 9436cd3..8a6f2e1 100644 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -92,7 +92,7 @@ include("head.inc"); </tr> <?php dump_clog($dhcpd_logfile, $nentries); ?> <tr><td><br /><form action="diag_logs_dhcp.php" method="post"> - <input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>" /></form</td> + <input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>" /></form></td> <td>NOTE: Clearing the log file will restart the DHCP daemon.</td></tr> </table> </div> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index dc6d1c8..71d3a34 100644 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -431,6 +431,7 @@ function check_everything() { <tr> <td> </td> <td><?=gettext("IP addresses of remote syslog servers, or an IP:port.");?></td> + </tr> </table> </td> </tr> diff --git a/usr/local/www/help.php b/usr/local/www/help.php index 83bab6d..387a14e 100644 --- a/usr/local/www/help.php +++ b/usr/local/www/help.php @@ -12,7 +12,7 @@ require_once("guiconfig.inc"); $helppages = array( /* These pages are confirmed to work and have usable content */ 'index.php' => 'https://doc.pfsense.org/index.php/Dashboard', - 'license.php' => 'https://www.pfsense.org/index.php@option=com_content&task=view&id=42&Itemid=62.html', + 'license.php' => 'https://www.pfsense.org/index.php@option=com_content&task=view&id=42&Itemid=62.html', 'miniupnpd.xml' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F', 'status_upnp.php' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F', 'firewall_virtual_ip.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses%3F', diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 150f718..8db3eae 100644 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -237,7 +237,7 @@ if ($_POST) { if($pkg['aftersaveredirect'] <> "") { pfSenseHeader($pkg['aftersaveredirect']); } elseif(!$pkg['adddeleteeditpagefields']) { - pfSenseHeader("pkg_edit.php?xml={$xml}&id=0"); + pfSenseHeader("pkg_edit.php?xml={$xml}&id=0"); } elseif(!$pkg['preoutput']) { pfSenseHeader("pkg.php?xml=" . $xml); } diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 5fda7ff..5c39178 100644 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -391,7 +391,7 @@ function show_advanced_dns() { <table border="0" cellspacing="0" cellpadding="1" summary="icons"> <tr> <td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td> - <td><a href="services_dnsmasq.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td> + <td><a href="services_dnsmasq.php?type=host&act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td> </tr> </table> </tr> @@ -472,7 +472,7 @@ function show_advanced_dns() { <?=htmlspecialchars($doment['descr']);?> </td> <td valign="middle" class="list nowrap"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a> - <a href="services_dnsmasq.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td> + <a href="services_dnsmasq.php?act=del&type=doverride&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td> </tr> <?php $i++; endforeach; ?> <tr style="display:none"><td></td></tr> diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc index c3e454f..d192c74 100644 --- a/usr/local/www/shortcuts.inc +++ b/usr/local/www/shortcuts.inc @@ -78,7 +78,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = switch ($shortcut_section) { case "openvpn": if (!empty($service['mode']) && is_numeric($service['id'])) - $link = "vpn_openvpn_{$service['mode']}.php?act=edit&id={$service['id']}"; + $link = "vpn_openvpn_{$service['mode']}.php?act=edit&id={$service['id']}"; else $link = $shortcuts[$shortcut_section]['main']; break; diff --git a/usr/local/www/shortcuts/pkg_upnp.inc b/usr/local/www/shortcuts/pkg_upnp.inc index 10213f0..05402a2 100644 --- a/usr/local/www/shortcuts/pkg_upnp.inc +++ b/usr/local/www/shortcuts/pkg_upnp.inc @@ -3,7 +3,7 @@ global $shortcuts; $shortcuts['upnp'] = array(); -$shortcuts['upnp']['main'] = "pkg_edit.php?xml=miniupnpd.xml&id=0"; +$shortcuts['upnp']['main'] = "pkg_edit.php?xml=miniupnpd.xml&id=0"; $shortcuts['upnp']['log'] = "diag_logs_routing.php"; $shortcuts['upnp']['status'] = "status_upnp.php"; $shortcuts['upnp']['service'] = "miniupnpd"; diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php index 553a58c..858a179 100644 --- a/usr/local/www/status_gateways.php +++ b/usr/local/www/status_gateways.php @@ -152,7 +152,8 @@ include("head.inc"); <?php } ?> </table> </div> - </table> +</td></tr> +</table> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/status_lb_vs.php b/usr/local/www/status_lb_vs.php index 814b924..5ea0af4 100644 --- a/usr/local/www/status_lb_vs.php +++ b/usr/local/www/status_lb_vs.php @@ -117,7 +117,7 @@ include("head.inc"); $rdr_a[$vsent['name']]['status'] = 'Unknown - relayd not running?'; } ?> - <td class="listr" nowrap> + <td class="listr nowrap"> <table border="0" cellpadding="3" cellspacing="2" summary="status"> <tr><td bgcolor="<?=$bgcolor?>"><?=$rdr_a[$vsent['name']]['status']?> </td></tr> </table> diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index f825cde..97968bb 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -403,7 +403,7 @@ if ($_POST) { write_config(); if ($userid) - pfSenseHeader("system_usermanager.php?act=edit&id={$userid}"); + pfSenseHeader("system_usermanager.php?act=edit&id={$userid}"); } } diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php index db13fcd..b66b1ac 100644 --- a/usr/local/www/system_crlmanager.php +++ b/usr/local/www/system_crlmanager.php @@ -598,7 +598,7 @@ function method_change() { <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" alt="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" width="17" height="17" border="0" /> </a> <?php else: ?> - <a href="system_crlmanager.php?act=editimported&id=<?=$tmpcrl['refid'];?>"> + <a href="system_crlmanager.php?act=editimported&id=<?=$tmpcrl['refid'];?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" alt="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" width="17" height="17" border="0" /> </a> <?php endif; ?> diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 2f8928b..26d3d92 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -109,10 +109,18 @@ include("head.inc"); </tr> </table> <br /> + <script type="text/javascript"> + //<![CDATA[ + window.onload=function(){ + document.getElementById("status").wrap='hard'; + document.getElementById("output").wrap='hard'; + } + //]]> + </script> <!-- status box --> - <textarea cols="90" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning firmware upgrade"); ?>.</textarea> + <textarea cols="90" rows="1" name="status" id="status"><?=gettext("Beginning firmware upgrade"); ?>.</textarea> <!-- command output box --> - <textarea cols="90" rows="25" name="output" id="output" wrap="hard"></textarea> + <textarea cols="90" rows="25" name="output" id="output"></textarea> </td> </tr> </table> diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index e2c3ebd..d09bda6 100644 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -92,7 +92,14 @@ include("head.inc"); </table> <br /> <!-- command output box --> - <textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output" wrap="hard"></textarea> + <script type="text/javascript"> + //<![CDATA[ + window.onload=function(){ + document.getElementById("output").wrap='hard'; + } + //]]> + </script> + <textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output"></textarea> <div id="backupdiv" style="visibility:hidden"> <?php if ($g['hidebackupbeforeupgrade'] === false): ?> <br /><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade");?> diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index a4345c9..d7d1921 100644 --- a/usr/local/www/system_groupmanager_addprivs.php +++ b/usr/local/www/system_groupmanager_addprivs.php @@ -110,7 +110,7 @@ if ($_POST) { $retval = write_config(); $savemsg = get_std_save_message($retval); - pfSenseHeader("system_groupmanager.php?act=edit&id={$groupid}"); + pfSenseHeader("system_groupmanager.php?act=edit&id={$groupid}"); exit; } } diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 4961a15..cf7db11 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -346,6 +346,7 @@ if ($_POST) { } } +$closehead = false; include("head.inc"); ?> @@ -353,10 +354,13 @@ include("head.inc"); <link rel="stylesheet" type="text/css" href="/javascript/jquery/jquery-ui.custom.css" /> <script type="text/javascript"> +//<![CDATA[ jQuery(function() { jQuery( "#expires" ).datepicker( { dateFormat: 'mm/dd/yy', changeYear: true, yearRange: "+0:+100" } ); }); +//]]> </script> +</head> <body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> @@ -600,7 +604,7 @@ function sshkeyClicked(obj) { </td> <td valign="middle" class="list nowrap"> <?php if (!$group): ?> - <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> + <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> </a> <?php endif; ?> @@ -653,13 +657,13 @@ function sshkeyClicked(obj) { <?=htmlspecialchars($ca['descr']);?> </td> <td valign="middle" class="list nowrap"> - <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> + <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export private key"); ?>" alt="<?=gettext("export private key"); ?>" width="17" height="17" border="0" /> </a> - <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> + <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert"); ?>" alt="<?=gettext("export cert"); ?>" width="17" height="17" border="0" /> </a> - <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to remove this certificate association?") .'\n'. gettext("(Certificate will not be deleted)");?>')"> + <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to remove this certificate association?") .'\n'. gettext("(Certificate will not be deleted)");?>')"> <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="<?=gettext("delete cert");?>" /> </a> </td> @@ -699,7 +703,7 @@ function sshkeyClicked(obj) { <?php if ($i > 0): ?> - <tr id="usercert" name="usercert" style="display:none"> + <tr id="usercert" style="display:none"> <td width="22%" valign="top" class="vncell"><?=gettext("Certificate");?></td> <td width="78%" class="vtable"> <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="certificate"> @@ -759,7 +763,14 @@ function sshkeyClicked(obj) { <tr id="sshkey" <?php if(empty($pconfig['authorizedkeys'])) echo 'style="display:none"'; ?>> <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> <td width="78%" class="vtable"> - <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> + <script type="text/javascript"> + //<![CDATA[ + window.onload=function(){ + document.getElementById("authorizedkeys").wrap='off'; + } + //]]> + </script> + <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> <br /> <?=gettext("Paste an authorized keys file here.");?> </td> @@ -875,4 +886,3 @@ function sshkeyClicked(obj) { <?php include("fend.inc");?> </body> </html> - diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php index bf4a02e..66b9b7e 100644 --- a/usr/local/www/system_usermanager_addprivs.php +++ b/usr/local/www/system_usermanager_addprivs.php @@ -99,7 +99,7 @@ if ($_POST) { $savemsg = get_std_save_message($retval); conf_mount_ro(); - pfSenseHeader("system_usermanager.php?act=edit&id={$userid}"); + pfSenseHeader("system_usermanager.php?act=edit&id={$userid}"); exit; } |