--- nfo/php/libs/org.netfrag.flib/Site/Loader.php	2002/11/12 05:42:31	1.1
+++ nfo/php/libs/org.netfrag.flib/Site/Loader.php	2002/12/12 21:37:46	1.2
@@ -1,8 +1,11 @@
 <?
 //    -------------------------------------------------------------------------
-//    $Id: Loader.php,v 1.1 2002/11/12 05:42:31 joko Exp $
+//    $Id: Loader.php,v 1.2 2002/12/12 21:37:46 joko Exp $
 //    -------------------------------------------------------------------------
 //    $Log: Loader.php,v $
+//    Revision 1.2  2002/12/12 21:37:46  joko
+//    + fixes: now returning success-/error-status
+//
 //    Revision 1.1  2002/11/12 05:42:31  joko
 //    + initial checkin
 //
@@ -16,13 +19,18 @@
   function includeFile($filename) {
 
     // TODO: try to remove these globals!
+    global $site;
     global $site_state;
     global $uservars;
     global $request;
+    global $http_referer;
 
     $this->site->log( get_class($this) . "->includeFile( filename $filename )", LOG_DEBUG);
     $site = &$this->site;
-    include($filename);
+    if (include($filename)) {
+      return 1;
+    }
+    
   }
   
   function loadComponent($name, $type = "") {
@@ -32,7 +40,8 @@
     switch ($type) {
       case "handler":
         $prefix = $this->site->config[path][base] . 'core/handler/';
-        $postfix = ".handler.php";
+        //$postfix = ".handler.php";
+        $postfix = ".php";
         break;
       case "page":
         $prefix = $this->site->config[path][base] . 'core/pages/';
@@ -40,17 +49,17 @@
         break;
     }
     $includefile = "$prefix$name$postfix";
-    $this->includeFile($includefile);
+    return $this->includeFile($includefile);
   }
   
   function loadHandler($name) {
     $this->site->log( get_class($this) . "->loadHandler( name $name )", LOG_DEBUG);
-    $this->loadComponent($name, "handler");
+    return $this->loadComponent($name, "handler");
   }
 
   function loadPage($name) {
     $this->site->log( get_class($this) . "->loadPage( name $name )", LOG_DEBUG);
-    $this->loadComponent($name, "page");
+    return $this->loadComponent($name, "page");
   }