--- nfo/php/libs/org.netfrag.glib/includes.php	2003/02/27 16:35:03	1.6
+++ nfo/php/libs/org.netfrag.glib/includes.php	2003/03/03 21:08:47	1.7
@@ -1,8 +1,11 @@
 <?
 // ---------------------------------------------------------------------------
-//  $Id: includes.php,v 1.6 2003/02/27 16:35:03 joko Exp $
+//  $Id: includes.php,v 1.7 2003/03/03 21:08:47 joko Exp $
 // ---------------------------------------------------------------------------
 //  $Log: includes.php,v $
+//  Revision 1.7  2003/03/03 21:08:47  joko
+//  updated
+//
 //  Revision 1.6  2003/02/27 16:35:03  joko
 //  + include path mungling now done via 'function add_include_path'
 //
@@ -25,49 +28,37 @@
 // ---------------------------------------------------------------------------
 
 
-// ------ override/expand php's 'include_path' setting ------
-function add_include_path($paths) {
+// some extension functions for php
+  global $PHP_EXTENSIONS_EXPORT;
+  //$PHP_EXTENSIONS_EXPORT = array( 'loadModule', array('mkObject' => 'mkInstance') );
+  $PHP_EXTENSIONS_EXPORT = array( 'loadModule', array('mkComponent' => 'mkObject') );
+  //$PHP_EXTENSIONS_EXPORT = array( 'loadModule' );
+
+  require_once("php_extensions.php");
+  //$php->Dumper_mode = HTML;
+  //exit;
     
-  if (!is_array($paths)) {
-    $paths = array($paths);
-  }
-  array_push($paths, ini_get("include_path"));
-  
-  // determine OS
-  $os = 'linux';
-  if (stristr($_SERVER["SERVER_SOFTWARE"], 'win32')) {
-    $os = 'windows';
-  }
-
-  $path_delimiter = ':';
-  // change path-delimiter for win32
-  if ($os == 'windows') { $path_delimiter = ';'; }
-  // build new 'include_path'-string
-  $path_new = join($path_delimiter, $paths);
-  ini_set("include_path", $path_new);
-}
-
-$smarty = $config['_startup'][path][lib][smarty];
-$pear = $config['_startup'][path][lib][pear];
-$flib = $config['_startup'][path][lib][flib];
-$glib = $config['_startup'][path][lib][glib];
-$lib_app = $config['_startup'][path][lib][app];
-
-add_include_path(array($pear, $flib, $glib, $lib_app));
-
+// tune libpath
+  $smarty = $config['_startup'][path][lib][smarty];
+  $pear = $config['_startup'][path][lib][pear];
+  $flib = $config['_startup'][path][lib][flib];
+  $glib = $config['_startup'][path][lib][glib];
+  $lib_app = $config['_startup'][path][lib][app];
+  php::add_libpath(array($pear, $glib, $lib_app));
+
+
+// PEAR modules
+
+  // --- logging
+  require_once 'Log.php';
+  require_once 'Log/file.php';
+
+  // --- benchmarking
+  require_once("Benchmark/Timer.php");
+  $timer = new Benchmark_Timer;
+  $timer->start();
+  $timer->setMarker("pear libraries: including");
 
-
-// =======================================
-// ------ pear libs ------
-  // benchmarking
-    require_once("Benchmark/Timer.php");
-    $timer = new Benchmark_Timer;
-    $timer->start();
-    $timer->setMarker("pear libraries: including");
-
-  // logging
-    require_once 'Log.php';
-    require_once 'Log/file.php';
   // date-handling and -manipulation ... 0.02 execution time for inclusion
     require_once 'Date.php';
   // database... 0.03 execution time for inclusion
@@ -83,11 +74,13 @@
 // ------ glib libraries/classes/components ------
    
   // abstract base classes - lowlevel
-    require_once("DesignPattern/Object.php");
-    loadModule('DesignPattern::Logger');
-    loadModule('DesignPattern::Bridge');
-    loadModule('DesignPattern::Loader');
-  
+
+    // old ones, got refactored somehow
+    //loadModule('DesignPattern::Object');
+    //loadModule('DesignPattern::Logger');
+    //loadModule('DesignPattern::Bridge');
+    //loadModule('DesignPattern::Loader');
+
   // abstract base classes - application level
     loadModule('Application::AbstractBase');
     loadModule('Application::AbstractRequest');
@@ -104,33 +97,15 @@
     loadModule('Data::Validator::CreditCard');
 
     // core/transport: rpc-xml communication
-    loadModule('Data::Driver::Proxy');
+    //loadModule('Data::Driver::Proxy');
     loadModule('Data::Driver::RPC::Remote');
 
 
-
 // =======================================
 // ------ flib libraries/classes ------
-  // error handling
-   require_once("Application/ErrorHandler.php");
-  // misc
-   require_once("utils/helper.php");
-   require_once("utils/shortcuts.php");
-  // array manipulation
-   require_once("utils/Array_Manip.php");
-
-  // utf8-encodings (Internationalization)
-  // iso <-> utf8
-   //require_once("Application/i18n/TextEncode.php");
-  // language (Localization)
-   require_once("Application/l10n/LocaleText.php");
-  // site
-   require_once("Site.php");
-  // user
-   require_once("Tracker/Session.php");
-   require_once("Tracker/User.php");
-  // tablebrowser
-   require_once("$flib/Site/Widget/TableBrowser.php");
+    php::add_libpath($flib);
+    require_once('includes.php');
+
 
 // ------ local libs - abstract ------
   // site
@@ -141,5 +116,4 @@
    define(SMARTY_DIR, $smarty);
    require_once(SMARTY_DIR . 'Smarty.class.php');
 
-
 ?>
\ No newline at end of file