Code cleaning and CS fixes.

Author: dsoares

config.inc.php.dist

@@ -40,4 +40,5 @@ $rcmail_config['recaptcha_log_failure'] = 'Error: Verification failed for %u. [%
 $rcmail_config['recaptcha_log_unknown'] = 'Error: Unknown log type.';
 
 // Block IPv6 clients based on prefix length
-$rcmail_config['rcguard_ipv6_prefix'] = 64;
+// Use an integer between 16 and 128, 0 to disable
+$rcmail_config['rcguard_ipv6_prefix'] = 0;

rcguard.php

@@ -279,24 +279,21 @@ private function get_client_ip()
         $prefix = rcmail::get_instance()->config->get('rcguard_ipv6_prefix', 128);
         $client_ip = rcube_utils::remote_addr();
 
-        // process only v6 addresses
-        if (!filter_var($client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
-
-            // process only if prefix is sane
-            if (is_int($prefix) && $prefix > 16 && $prefix < 128 ) {
-
-                // construct subnet mask
-                $mask_string = str_repeat('1', $prefix) . str_repeat('0', 128-$prefix);
-                $mask_split = str_split($mask_string, 16);
-                foreach($mask_split as &$item) {
-                    $item = base_convert($item, 2, 16);
-                }
-                $mask_hex = implode(":", $mask_split);
-
-                // return network part
-                return inet_ntop( inet_pton($client_ip) & inet_pton($mask_hex) );
+        // process only if prefix is sane and it's an IPv6 address
+        if (is_int($prefix) && $prefix > 16 && $prefix < 128 &&
+            filter_var($client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false) {
+
+            // construct subnet mask
+            $mask_string = str_repeat('1', $prefix) . str_repeat('0', 128 - $prefix);
+            $mask_split = str_split($mask_string, 16);
+            foreach ($mask_split as $item) {
+                $item = base_convert($item, 2, 16);
             }
-         }
+            $mask_hex = implode(":", $mask_split);
+
+            // return network part
+            return inet_ntop(inet_pton($client_ip) & inet_pton($mask_hex));
+        }
 
          // fall back: return unaltered client IP
          return $client_ip;