--- nfo/php/libs/org.netfrag.glib/includes.php	2003/02/22 16:17:56	1.5
+++ nfo/php/libs/org.netfrag.glib/includes.php	2003/02/27 16:35:03	1.6
@@ -1,8 +1,11 @@
 <?
 // ---------------------------------------------------------------------------
-//  $Id: includes.php,v 1.5 2003/02/22 16:17:56 joko Exp $
+//  $Id: includes.php,v 1.6 2003/02/27 16:35:03 joko Exp $
 // ---------------------------------------------------------------------------
 //  $Log: includes.php,v $
+//  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
@@ -22,14 +25,14 @@
 // ---------------------------------------------------------------------------
 
 
-$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];
-
-
-  // ------ override/expand php's 'include_path' setting ------
+// ------ override/expand php's 'include_path' setting ------
+function add_include_path($paths) {
+    
+  if (!is_array($paths)) {
+    $paths = array($paths);
+  }
+  array_push($paths, ini_get("include_path"));
+  
   // determine OS
   $os = 'linux';
   if (stristr($_SERVER["SERVER_SOFTWARE"], 'win32')) {
@@ -40,8 +43,18 @@
   // change path-delimiter for win32
   if ($os == 'windows') { $path_delimiter = ';'; }
   // build new 'include_path'-string
-  $path_new = join($path_delimiter, array($pear, $flib, $glib, $lib_app, ini_get("include_path")));
+  $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));
+
 
 
 // =======================================