--- nfo/php/libs/org.netfrag.glib/includes.php	2003/03/10 23:05:24	1.9
+++ nfo/php/libs/org.netfrag.glib/includes.php	2004/07/21 12:56:45	1.16
@@ -7,58 +7,78 @@
  *
  */
 
+/**
+ * <b>Cvs-Log:</b>
+ *
+ * <pre>
+ *
+ *  $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
+ *
+ *  Revision 1.13  2003/03/28 06:43:20  joko
+ *  initial commit: php_constants.php
+ *
+ *  Revision 1.12  2003/03/11 02:23:02  joko
+ *  + fixed metadata for phpDocumentor
+ *
+ *  Revision 1.11  2003/03/11 02:14:17  joko
+ *  + fixed metadata for phpDocumentor
+ *
+ *  Revision 1.10  2003/03/10 23:24:59  joko
+ *  + fixed metadata for phpDocumentor
+ *
+ *  Revision 1.9  2003/03/10 23:05:24  joko
+ *  + fixed metadata for phpDocumentor
+ *
+ *  Revision 1.8  2003/03/03 22:13:45  joko
+ *  minor update regarding includes
+ *
+ *  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'
+ *
+ *  Revision 1.5  2003/02/22 16:17:56  joko
+ *  + include path for new sister library org.netfrag.app
+ *  + autoloading abstract class for backend-communication
+ *
+ *  Revision 1.4  2003/02/09 16:52:08  joko
+ *  + updated, new modules in this library
+ *
+ *  Revision 1.3  2003/02/04 08:26:18  joko
+ *  + fixed comment
+ *
+ *  Revision 1.2  2003/02/04 08:25:43  joko
+ *  + minor modification regarding configuration/resource variable hierarchy
+ *
+ *  Revision 1.1  2003/02/03 14:39:58  joko
+ *  + initial commit
+ *
+ * </pre>
+ *
+ */
 
-// ---------------------------------------------------------------------------
-//  $Id: includes.php,v 1.9 2003/03/10 23:05:24 joko Exp $
-// ---------------------------------------------------------------------------
-//  $Log: includes.php,v $
-//  Revision 1.9  2003/03/10 23:05:24  joko
-//  + fixed metadata for phpDocumentor
-//
-//  Revision 1.8  2003/03/03 22:13:45  joko
-//  minor update regarding includes
-//
-//  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'
-//
-//  Revision 1.5  2003/02/22 16:17:56  joko
-//  + include path for new sister library org.netfrag.app
-//  + autoloading abstract class for backend-communication
-//
-//  Revision 1.4  2003/02/09 16:52:08  joko
-//  + updated, new modules in this library
-//
-//  Revision 1.3  2003/02/04 08:26:18  joko
-//  + fixed comment
-//
-//  Revision 1.2  2003/02/04 08:25:43  joko
-//  + minor modification regarding configuration/resource variable hierarchy
-//
-//  Revision 1.1  2003/02/03 14:39:58  joko
-//  + initial commit
-//
-// ---------------------------------------------------------------------------
-
-
-// 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
-  $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];
+  // 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'];
   php::add_libpath(array($pear, $glib, $lib_app));