Changeset 57 for trunk/plugins/Linker/scan.php

Timestamp:

04/04/05 07:23:56 (7 years ago)

Author:

niko

Message:

ticket #67:
- label for files using the syntax suggested by gogo
- updated scan.php to use the new syntax

ticket #99:
- if scan.php returns invalid code the parse-error will be shown in the tree

(no alert-box, see http://xinha.gogo.co.nz/punbb/viewtopic.php?id=130)

Files:

• trunk/plugins/Linker/scan.php (modified) (3 diffs)

trunk/plugins/Linker/scan.php

@@ -62 +62 @@
             if($subdir = scan($path, $url))
             {
-              $files[] = array($url, $subdir);
+              $files[] = array('url'=>$url, 'children'=>$subdir);
             }
           }
@@ -68 +68 @@
           {
             if(($include && !preg_match($include, $url)) || ($exclude && preg_match($exclude, $url))) continue;
-            $files[] = $url;
+            $files[] = array('url'=>$url);
           }
 
@@ -104 +104 @@
       if(is_array($var))
       {
+        $useObject = false;
+        foreach(array_keys($var) as $k) {
+            if(!is_numeric($k)) $useObject = true;
+        }
         $js = array();
         foreach($var as $k => $v)
         {
-          $js[] = to_js($v, $tabs + 1);
+          $i = "";
+          if($useObject) {
+            if(preg_match('#[a-zA-Z]+[a-zA-Z0-9]*#', $k)) {
+              $i .= "$k: ";
+            } else {
+              $i .= "'$k': ";
+            }
+          }
+          $i .= to_js($v, $tabs + 1);
+          $js[] = $i;
         }
-        return "[\n" . tabify(implode(",\n", $js), $tabs) . "\n]";
+        if($useObject) {
+            $ret = "{\n" . tabify(implode(",\n", $js), $tabs) . "\n}";
+        } else {
+            $ret = "[\n" . tabify(implode(",\n", $js), $tabs) . "\n]";
+        }
+        return $ret;
       }