diff options
author | Renato Botelho <garga@pfSense.org> | 2014-03-25 14:35:55 -0300 |
---|---|---|
committer | Renato Botelho <garga@pfSense.org> | 2014-03-25 14:35:55 -0300 |
commit | 6fba8620e561eab65837cd72b8ba6b057e053af2 (patch) | |
tree | ef5b33510a44071f5e36cd473f34628440d077a1 /etc | |
parent | 26661ec9933d4fb91c357d9d38ea682dd661eb7f (diff) | |
parent | de22e9ca9864d802ad1ec1376247b788efb6938a (diff) | |
download | pfsense-6fba8620e561eab65837cd72b8ba6b057e053af2.zip pfsense-6fba8620e561eab65837cd72b8ba6b057e053af2.tar.gz |
Merge pull request #1031 from ayvis/master-br-patch
replaced uppercase html tags with lowercase
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/IPv6.inc | 2 | ||||
-rw-r--r-- | etc/inc/captiveportal.inc | 44 | ||||
-rw-r--r-- | etc/inc/interfaces.inc | 10 | ||||
-rw-r--r-- | etc/inc/pkg-utils.inc | 16 | ||||
-rw-r--r-- | etc/inc/services.inc | 2 | ||||
-rw-r--r-- | etc/inc/shaper.inc | 2 |
6 files changed, 38 insertions, 38 deletions
diff --git a/etc/inc/IPv6.inc b/etc/inc/IPv6.inc index ed8bbec..ab9aa65 100644 --- a/etc/inc/IPv6.inc +++ b/etc/inc/IPv6.inc @@ -477,7 +477,7 @@ class Net_IPv6 } else if (0 == strncmp('0000010', $binip, 7)) { - return NET_IPV6_RESERVED_IPX;; + return NET_IPV6_RESERVED_IPX; } else if (0 == strncmp('0000011', $binip, 7) || 0 == strncmp('111110', $binip, 6) || diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 25bccdf..1383e86 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -276,36 +276,36 @@ function captiveportal_configure_zone($cpcfg) { else { /* example page */ $logouttext = <<<EOD -<HTML> -<HEAD><TITLE>Redirecting...</TITLE></HEAD> -<BODY> -<SPAN STYLE="font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;"> -<B>Redirecting to <A HREF="<?=\$my_redirurl;?>"><?=\$my_redirurl;?></A>...</B> -</SPAN> -<SCRIPT LANGUAGE="JavaScript"> +<html> +<head><title>Redirecting...</title></head> +<body> +<span style="font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;"> +<b>Redirecting to <a href="<?=\$my_redirurl;?>"><?=\$my_redirurl;?></a>...</b> +</span> +<script type="text/javascript"> <!-- LogoutWin = window.open('', 'Logout', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=256,height=64'); if (LogoutWin) { - LogoutWin.document.write('<HTML>'); - LogoutWin.document.write('<HEAD><TITLE>Logout</TITLE></HEAD>') ; - LogoutWin.document.write('<BODY BGCOLOR="#435370">'); - LogoutWin.document.write('<DIV ALIGN="center" STYLE="color: #ffffff; font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;">') ; - LogoutWin.document.write('<B>Click the button below to disconnect</B><P>'); - LogoutWin.document.write('<FORM METHOD="POST" ACTION="<?=\$logouturl;?>">'); - LogoutWin.document.write('<INPUT NAME="logout_id" TYPE="hidden" VALUE="<?=\$sessionid;?>">'); - LogoutWin.document.write('<INPUT NAME="zone" TYPE="hidden" VALUE="<?=\$cpzone;?>">'); - LogoutWin.document.write('<INPUT NAME="logout" TYPE="submit" VALUE="Logout">'); - LogoutWin.document.write('</FORM>'); - LogoutWin.document.write('</DIV></BODY>'); - LogoutWin.document.write('</HTML>'); + LogoutWin.document.write('<html>'); + LogoutWin.document.write('<head><title>Logout</title></head>') ; + LogoutWin.document.write('<body bgcolor="#435370">'); + LogoutWin.document.write('<div align="center" style="color: #ffffff; font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: 11px;">') ; + LogoutWin.document.write('<b>Click the button below to disconnect</b><p />'); + LogoutWin.document.write('<form method="POST" action="<?=\$logouturl;?>">'); + LogoutWin.document.write('<input name="logout_id" type="hidden" value="<?=\$sessionid;?>" />'); + LogoutWin.document.write('<input name="zone" type="hidden" value="<?=\$cpzone;?>" />'); + LogoutWin.document.write('<input name="logout" type="submit" value="Logout" />'); + LogoutWin.document.write('</form>'); + LogoutWin.document.write('</div></body>'); + LogoutWin.document.write('</html>'); LogoutWin.document.close(); } document.location.href="<?=\$my_redirurl;?>"; --> -</SCRIPT> -</BODY> -</HTML> +</script> +</body> +</html> EOD; } diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 3112767..6453947 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3244,7 +3244,7 @@ function interface_track6_6rd_configure($interface = "lan", $lancfg) { // echo "64 - (prefixlen {$rd6prefixlen} + v4len (32 - {$wancfg['prefix-6rd-v4plen']})) = {$restbits} \n"; $rd6lanbin .= substr(sprintf("%032b", str_pad($lancfg['track6-prefix-id'], 32, "0", STR_PAD_LEFT)), (32 - $restbits), 32); /* fill the rest out with zeros */ - $rd6lanbin = str_pad($rd6lanbin, 128, "0", STR_PAD_RIGHT);; + $rd6lanbin = str_pad($rd6lanbin, 128, "0", STR_PAD_RIGHT); /* convert the 128 bits for the lan address back into a valid IPv6 address */ $rd6lan = convert_128bit_to_ipv6($rd6lanbin) ."1"; @@ -3301,7 +3301,7 @@ function interface_track6_6to4_configure($interface = "lan", $lancfg) { /* add the custom prefix id */ $sixto4lanbin .= sprintf("%016b", $lancfg['track6-prefix-id']); /* fill the rest out with zeros */ - $sixto4lanbin = str_pad($sixto4lanbin, 128, "0", STR_PAD_RIGHT);; + $sixto4lanbin = str_pad($sixto4lanbin, 128, "0", STR_PAD_RIGHT); /* convert the 128 bits for the lan address back into a valid IPv6 address */ $sixto4lan = convert_128bit_to_ipv6($sixto4lanbin) ."1"; @@ -3351,7 +3351,7 @@ function interface_6rd_configure($interface = "wan", $wancfg) { /* if the prefix length is not 32 bits we need to shave bits off from the left of the v4 address. */ $rd6prefixbin .= substr(sprintf("%032b", hexdec($hexwanv4)), $wancfg['prefix-6rd-v4plen'], 32); /* fill out the rest with 0's */ - $rd6prefixbin = str_pad($rd6prefixbin, 128, "0", STR_PAD_RIGHT);; + $rd6prefixbin = str_pad($rd6prefixbin, 128, "0", STR_PAD_RIGHT); /* convert the 128 bits for the broker address back into a valid IPv6 address */ $rd6prefix = convert_128bit_to_ipv6($rd6prefixbin); @@ -3433,11 +3433,11 @@ function interface_6to4_configure($interface = "wan", $wancfg){ /* if the prefix length is not 32 bits we need to shave bits off from the left of the v4 address. */ $stfbrokerbin = substr(sprintf("%032b", hexdec($hexbrv4)), $v4prefixlen, 32); - $stfbrokerbin = str_pad($stfprefixstartbin . $stfbrokerbin, 128, "0", STR_PAD_RIGHT);; + $stfbrokerbin = str_pad($stfprefixstartbin . $stfbrokerbin, 128, "0", STR_PAD_RIGHT); /* for the local subnet too. */ $stflanbin = substr(sprintf("%032b", hexdec($hexwanv4)), $v4prefixlen, 32); - $stflanbin = str_pad($stfprefixstartbin . $stflanbin, 128, "0", STR_PAD_RIGHT);; + $stflanbin = str_pad($stfprefixstartbin . $stflanbin, 128, "0", STR_PAD_RIGHT); /* convert the 128 bits for the broker address back into a valid IPv6 address */ $stfbrarr = array(); diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 7e16414..d075bab 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -700,8 +700,8 @@ function install_package_xml($pkg) { $static_output .= sprintf(gettext("The %s package is not installed.%sInstallation aborted."), $pkg, "\n\n"); update_output_window($static_output); if($pkg_interface <> "console") { - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progholder.style.visibility='hidden';</script>"; } sleep(1); return false; @@ -727,8 +727,8 @@ function install_package_xml($pkg) { update_output_window($static_output); pkg_debug(gettext("Package WAS NOT installed properly.") . "\n"); if($pkg_interface <> "console") { - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progholder.style.visibility='hidden';</script>"; } sleep(1); return false; @@ -924,8 +924,8 @@ function install_package_xml($pkg) { update_output_window($static_output); pkg_debug(gettext("Unable to load package configuration. Installation aborted.") ."\n"); if($pkg_interface <> "console") { - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progholder.style.visibility='hidden';</script>"; } sleep(1); return false; @@ -990,8 +990,8 @@ function delete_package_xml($pkg) { $static_output .= sprintf(gettext("The %s package is not installed.%sDeletion aborted."), $pkg, "\n\n"); update_output_window($static_output); if($pkg_interface <> "console") { - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script type=\"text/javascript\">document.progholder.style.visibility='hidden';</script>"; } ob_flush(); sleep(1); diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a743732..0a36701 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1040,7 +1040,7 @@ function services_dhcpdv6_configure($blacklist = array()) { $dhcpdv6cfg[$ifname]['range'] = array(); $dhcpdv6cfg[$ifname]['range']['from'] = Net_IPv6::compress(implode(":", $ifcfgipv6arr)); $ifcfgipv6arr[7] = "2000"; - $dhcpdv6cfg[$ifname]['range']['to'] = Net_IPv6::compress(implode(":", $ifcfgipv6arr));; + $dhcpdv6cfg[$ifname]['range']['to'] = Net_IPv6::compress(implode(":", $ifcfgipv6arr)); /* prefix length > 0? We can add dhcp6 prefix delegation server */ if($pdlen > 2) { $pdlenmax = $pdlen; diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 83ab9ee..483ccf3 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -4242,7 +4242,7 @@ function altq_check_default_queues() { $count++; } } - else $count++;; + else $count++; return 0; } |