Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Linker/scan.php
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Linker/scan.php,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Linker/scan.php	2 Nov 2005 08:56:26 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Linker/scan.php	2 Feb 2007 21:05:02 -0000	1.2
@@ -1,12 +1,23 @@
 <?php
-
     // /home/username/foo/public_html/
-    $dir = dirname(__FILE__)."/../..";
+    $dir          = dirname(__FILE__)."/../..";
     $include      = '/\.(php|shtml|html|htm|shtm|cgi|txt|doc|pdf|rtf|xls|csv)$/';
     $exclude      = '';
     $dirinclude   = '';
     $direxclude   = '/(^|\/)[._]|htmlarea/'; // Exclude the htmlarea tree by default
 
+    // New backend config data passing
+    //  if data was passed using xinha_pass_to_backend() we extract and use it
+    //  as the items above    
+    require_once(realpath(dirname(__FILE__) . '/../../contrib/php-xinha.php'));
+    if($passed_data = xinha_read_passed_data())
+    {
+      extract($passed_data);      
+    }
+
+    // Old deprecated backend config data passing
+    //  not described because you shouldn't use it.
+    //------------------------------------------------------------------------    
     $hash = '';
     foreach(explode(',', 'dir,include,exclude,dirinclude,direxclude') as $k)
     {
@@ -32,7 +43,9 @@
         exit;
       }
     }
+    //------------------------------------------------------------------------
 
+
     function scan($dir, $durl = '')
     {
       global $include, $exclude, $dirinclude, $direxclude;
@@ -84,79 +97,10 @@
 
     function dircomp($a, $b)
     {
-      if(is_array($a)) $a = $a[0];
-      if(is_array($b)) $b = $b[0];
+      if(is_array($a)) $a = array_shift($a);
+      if(is_array($b)) $b = array_shift($b);
       return strcmp(strtolower($a), strtolower($b));
     }
-
-    function to_js($var, $tabs = 0)
-    {
-      if(is_numeric($var))
-      {
-        return $var;
-      }
-
-      if(is_string($var))
-      {
-        return "'" . js_encode($var) . "'";
-      }
-
-      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)
-        {
-          $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;
-        }
-        if($useObject) {
-            $ret = "{\n" . tabify(implode(",\n", $js), $tabs) . "\n}";
-        } else {
-            $ret = "[\n" . tabify(implode(",\n", $js), $tabs) . "\n]";
-        }
-        return $ret;
-      }
-
-      return 'null';
-    }
-
-    function tabify($text, $tabs)
-    {
-      if($text)
-      {
-        return str_repeat("  ", $tabs) . preg_replace('/\n(.)/', "\n" . str_repeat("  ", $tabs) . "\$1", $text);
-      }
-    }
-
-    function js_encode($string)
-    {
-      static $strings = "\\,\",',%,&,<,>,{,},@,\n,\r";
-
-      if(!is_array($strings))
-      {
-        $tr = array();
-        foreach(explode(',', $strings) as $chr)
-        {
-          $tr[$chr] = sprintf('\x%02X', ord($chr));
-        }
-        $strings = $tr;
-      }
-
-      return strtr($string, $strings);
-    }
-
-
-    echo to_js(scan($dir));
+   
+    echo xinha_to_js(scan($dir));
 ?>