--- nfo/php/libs/org.netfrag.glib/includes.php	2003/04/04 17:36:16	1.14
+++ nfo/php/libs/org.netfrag.glib/includes.php	2004/07/21 12:56:45	1.16
@@ -12,9 +12,15 @@
  *
  * <pre>
  *
- *  $Id: includes.php,v 1.14 2003/04/04 17:36:16 joko Exp $
+ *  $Id: includes.php,v 1.16 2004/07/21 12:56:45 joko Exp $
  *
  *  $Log: includes.php,v $
+ *  Revision 1.16  2004/07/21 12:56:45  joko
+ *  minor change to hash-key use
+ *
+ *  Revision 1.15  2003/04/05 19:55:24  joko
+ *  moved some code to utils/includes.php
+ *
  *  Revision 1.14  2003/04/04 17:36:16  joko
  *  added new required file
  *
@@ -63,27 +69,16 @@
  */
 
 
-// some constant handling extension functions for php
-  require_once("php_constants.php");
-  require_once("php_errors.php");
-
-// 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;
+// utility- and helper functions- and classes
+require_once("utils/includes.php");
     
 // tune libpath
   // FIXME: enhance! use constants here!!!
-  $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];
+  $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));