Changeset 13493

Timestamp:

02/20/12 20:15:54 (1 year ago)

Author:

p_lindheimer

Message:

fixes #5145 when leading or trailing '/' are used in trunk name, they are still problematic if used embedded in the name since we must parse the Asterisk line which uses '/' also and would be very difficult to decode. Should simply make '/' an invalid character in trunk names...

Files:

• modules/branches/2.10/dashboard/class.astinfo.php (modified) (1 diff)

modules/branches/2.10/dashboard/class.astinfo.php

@@ -98 +98 @@
-    $astout = explode("\n",$response['data']);  
-    foreach ($astout as $line) {
+      $line = trim(str_replace('//','/',$line),'/');
-      if (preg_match('/^(([a-z0-9\-_]+)(\/([a-z0-9\-_]+))?)\s+(\([a-z]+\)|\d{1,3}(\.\d{1,3}){3})/i', $line, $matches)) {
-        //matches: [2] = name, [4] = username, [5] = host, [6] = part of ip (if IP)