finished first "alpha" version of PHP-P10 v2

[PHP-P10.git] / Uplink / Numerics.class.php

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index cb555fb2efad07008a5cb36d333282e5a03d2c23..7b6bee116e219da74223c50deb4d5ff1f215d480 100644 (file)
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.class.php
@@ -136,15 +136,26 @@ class Numerics {
                        //thats a little bit complicated :D (we may only have one _)
                        $ipv6 = array();
                        $ip = explode(":",$ip);
-                       $last_zero = false; $zero_sequence = 0; $biggest_zero_sequence = 0, $max_start = -1;
-                       foreach($ip as $i => $v) {
+                       $last_zero = false; $zero_sequence = 0; $biggest_zero_sequence = 0; $max_start = -1;
+                       $i = 0;
+                       foreach($ip as $v) {
                                if($v == "") {
                                        $skipBlocks = (8 - count($ip));
                                        for($j = 0; $j < $skipBlocks; $j++) {
                                                $ipv6[$i+$j] = "_";
                                        }
                                        $max_start = $i;
-                                       $biggest_zero_sequence = $skipBlocks;
+                                       if($last_zero) {
+                                               $zero_sequence += $skipBlocks;
+                                       } else {
+                                               $last_zero = true;
+                                               $zero_sequence = $skipBlocks;
+                                       }
+                                       $i+=$skipBlocks;
+                                       if($zero_sequence > $biggest_zero_sequence) {
+                                               $biggest_zero_sequence = $zero_sequence;
+                                               $max_start = $i-($zero_sequence-1);
+                                       }
                                } else {
                                        $value = hexdec($v);
                                        if($value == 0) {
@@ -163,13 +174,14 @@ class Numerics {
                                                $ipv6[$i] = self::intToNum($value,3);
                                                $last_zero = false;
                                        }
+                                       $i++;
                                }
                        }
                        $ip = "";
                        for($i = 0; $i < 8; $i++) {
                                if($i == $max_start) { //merge the biggest sequence of _'s
                                        $ip .= "_";
-                                       $i += ($biggest_zero_sequence-1)
+                                       $i += ($biggest_zero_sequence-1);
                                } elseif($ipv6[$i] == "_") {
                                        $ip .= "AAA";
                                } else {