Changeset 2623

Timestamp:

02/21/10 20:55:04 (2 years ago)

Author:

benedikt

Message:

• Changed Net_DNS to be PHP 5.3 compatible (fix)

Location:

trunk/gui/include/Net_DNS/DNS

Files:

• Packet.php (modified) (1 diff)
• RR.php (modified) (1 diff)
• RR/CNAME.php (modified) (1 diff)
• RR/MX.php (modified) (1 diff)
• RR/NS.php (modified) (1 diff)
• RR/PTR.php (modified) (1 diff)
• RR/SOA.php (modified) (1 diff)
• RR/SRV.php (modified) (1 diff)
• RR/TSIG.php (modified) (1 diff)
• Resolver.php (modified) (1 diff)

trunk/gui/include/Net_DNS/DNS/Packet.php

@@ -436 +436 @@
             }
         }
-        $name = preg_replace('\.$', '', $name);
+        $name = preg_replace('/\.$/', '', $name);
         return array($name, $offset);
     }

trunk/gui/include/Net_DNS/DNS/RR.php

@@ -114 +114 @@
             $s = array_shift($parts);
             if (!isset($name)) {
-                $name = preg_replace('\.+$', '', $s);
+                $name = preg_replace('/\.+$/', '', $s);
             } else if (preg_match('/^\d+$/', $s)) {
                 $ttl = $s;

trunk/gui/include/Net_DNS/DNS/RR/CNAME.php

@@ -52 +52 @@
             }
         } else {
-            $this->cname = preg_replace("[ \t]+(.+)[\. \t]*$", '\\1', $data);
+            $this->cname = preg_replace("/[ \t]+(.+)[\. \t]*$/", '\\1', $data);
         }
     }

trunk/gui/include/Net_DNS/DNS/RR/MX.php

@@ -58 +58 @@
             preg_match("@([0-9]+)[ \t]+(.+)[ \t]*$@", $data, $regs);
             $this->preference = $regs[1];
-            $this->exchange = preg_replace('(.*)\.$', '\\1', $regs[2]);
+            $this->exchange = preg_replace('/(.*)\.$/', '\\1', $regs[2]);
         }
     }

trunk/gui/include/Net_DNS/DNS/RR/NS.php

@@ -53 +53 @@
             }
         } else {
-            $this->nsdname = preg_replace("[ \t]+(.+)[ \t]*$", '\\1', $data);
+            $this->nsdname = preg_replace("/[ \t]+(.+)[ \t]*$/", '\\1', $data);
         }
     }

trunk/gui/include/Net_DNS/DNS/RR/PTR.php

@@ -53 +53 @@
             }
         } else {
-            $this->ptrdname = preg_replace("[ \t]+(.+)[ \t]*$", '\\1', $data);
+            $this->ptrdname = preg_replace("/[ \t]+(.+)[ \t]*$/", '\\1', $data);
         }
     }

trunk/gui/include/Net_DNS/DNS/RR/SOA.php

@@ -69 +69 @@
             if (preg_match("@([^ \t]+)[ \t]+([^ \t]+)[ \t]+([0-9]+)[^ \t]+([0-9]+)[^ \t]+([0-9]+)[^ \t]+([0-9]+)[^ \t]*$@", $string, $regs))
             {
-                $this->mname = preg_replace('(.*)\.$', '\\1', $regs[1]);
-                $this->rname = preg_replace('(.*)\.$', '\\1', $regs[2]);
+                $this->mname = preg_replace('/(.*)\.$/', '\\1', $regs[1]);
+                $this->rname = preg_replace('/(.*)\.$/', '\\1', $regs[2]);
                 $this->serial = $regs[3];
                 $this->refresh = $regs[4];

trunk/gui/include/Net_DNS/DNS/RR/SRV.php

@@ -64 +64 @@
             $this->weight = $regs[2];
             $this->port = $regs[3];
-            $this->target = preg_replace('(.*)\.$', '\\1', $regs[4]);
+            $this->target = preg_replace('/(.*)\.$/', '\\1', $regs[4]);
         }
     }

trunk/gui/include/Net_DNS/DNS/RR/TSIG.php

@@ -143 +143 @@
         if (strlen($this->key)) {
             $key = $this->key;
-            $key = preg_replace(' ', '', $key);
+            $key = preg_replace('/ /', '', $key);
             $key = base64_decode($key);
 

trunk/gui/include/Net_DNS/DNS/Resolver.php

@@ -326 +326 @@
             while (! feof($f)) {
                 $line = chop(fgets($f, 10240));
-                $line = preg_replace('(.*)[;#].*', '\\1', $line);
+                $line = preg_replace('/(.*)[;#].*/', '\\1', $line);
                 if (preg_match("@^[ \t]*$@", $line, $regs)) {
                     continue;