--- nfo/php/libs/org.netfrag.glib/DataSource/Locator.php	2003/03/28 06:46:00	1.31
+++ nfo/php/libs/org.netfrag.glib/DataSource/Locator.php	2003/04/04 21:21:16	1.32
@@ -21,9 +21,12 @@
  * <b>Cvs-Log:</b>
  *
  * <pre>
- * $Id: Locator.php,v 1.31 2003/03/28 06:46:00 joko Exp $
+ * $Id: Locator.php,v 1.32 2003/04/04 21:21:16 joko Exp $
  *
  * $Log: Locator.php,v $
+ * Revision 1.32  2003/04/04 21:21:16  joko
+ * new attributes in locator hash for rpc-connections: USER and PASS
+ *
  * Revision 1.31  2003/03/28 06:46:00  joko
  * new helper: 'function get_call'
  *
@@ -377,12 +380,16 @@
 
 
   function build( ) {
+
+    //print "locator - build!<br/>";
     
     // trace
       //print Dumper($this);
 
     $good = 0;
     switch ($this->_datasource_type) {
+      
+      // TODO: dispatch Host, Port, User and Pass by transport here!!!
       case 'rpc':
         // get rpc connection information from global constants
         $metadata = array(
@@ -390,17 +397,22 @@
           //package => 'DataSource::Proxy::XMLRPC',
           //package => 'DataSource::Generic',
           //package => 'DesignPattern::RemoteProxy',
-          Host => RPC_HOSTNAME,
-          Port => RPC_PORT,
-          DEBUG => defined('RPC_DEBUG') ? RPC_DEBUG : null,
-          TRACE => defined('RPC_TRACE') ? RPC_TRACE : null,
-          DISCONNECT_ON_ERROR => defined('RPC_DISCONNECT_ON_ERROR') ? RPC_DISCONNECT_ON_ERROR : null,
+          'Host' => RPC_HOSTNAME,
+          'Port' => RPC_PORT,
+          'DEBUG' => constants::get('RPC_DEBUG'),
+          'TRACE' => constants::get('RPC_TRACE'),
+          'DISCONNECT_ON_ERROR' => constants::get('RPC_DISCONNECT_ON_ERROR'),
+          // FIXME!!! 'ws_admin' is hardcoded here!!!
+          'USER' => $_SESSION[ws_admin][user],
+          'PASS' => $_SESSION[ws_admin][pass],
         );
         $good = 1;
         break;
     }
     
     if ($good) {
+
+      //print Dumper($metadata);
       
       // V1:
       /*