diff --git a/etc/inc/IPv6.inc b/etc/inc/IPv6.inc index ed8bbecb89..ab9aa657ef 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 183779817a..c45e984359 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -276,36 +276,36 @@ function captiveportal_configure_zone($cpcfg) { else { /* example page */ $logouttext = << -Redirecting... - - -Redirecting to ... - - - - + + + EOD; } diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index df452b775e..a82884efc9 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3250,7 +3250,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"; @@ -3307,7 +3307,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"; @@ -3357,7 +3357,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); @@ -3439,11 +3439,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 7e16414ea3..d075bab843 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"; - echo "\n"; + echo "\n"; + echo "\n"; } 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"; - echo "\n"; + echo "\n"; + echo "\n"; } 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"; - echo "\n"; + echo "\n"; + echo "\n"; } 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"; - echo "\n"; + echo "\n"; + echo "\n"; } ob_flush(); sleep(1); diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a7437325bf..0a36701104 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 83ab9ee4f3..483ccf313c 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; } diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php index 1f7a6cf549..83cd333948 100644 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -127,7 +127,7 @@ if ($_POST['logout_id']) { You have been disconnected. - - * + * + * * *