--- nfo/php/libs/org.netfrag.flib/Site.php	2002/12/19 06:17:32	1.3
+++ nfo/php/libs/org.netfrag.flib/Site.php	2002/12/23 11:33:58	1.5
@@ -1,8 +1,14 @@
 <?
 //    -------------------------------------------------------------------------------
-//    $Id: Site.php,v 1.3 2002/12/19 06:17:32 joko Exp $
+//    $Id: Site.php,v 1.5 2002/12/23 11:33:58 jonen Exp $
 //    -------------------------------------------------------------------------------
 //    $Log: Site.php,v $
+//    Revision 1.5  2002/12/23 11:33:58  jonen
+//    + minor changes
+//
+//    Revision 1.4  2002/12/19 16:25:29  joko
+//    + function loadCmsPage($template, $data_merge = array())
+//
 //    Revision 1.3  2002/12/19 06:17:32  joko
 //    + database, smarty, and langtext (lt) now gets initialized here (on Site startup)
 //
@@ -109,8 +115,8 @@
   function &loadHandler($a) {
     return $this->loader->loadHandler($a);
   }
-  function &loadPage($a) {
-    return $this->loader->loadPage($a);
+  function &loadPage($a, $b = array()) {
+    return $this->loader->loadPage($a, $b);
   }
   function &loadTemplate($a, $b = array(), $c = "") {
     return $this->loader->loadTemplate($a, $b, $c);
@@ -153,6 +159,28 @@
     }
   }
   
+  function loadCmsPage($template, $data_merge = array()) {
+    
+//print Dumper($this->getRequest());
+    
+    // default data to provide to scope of cms
+    // TODO/REVIEW: should we be more strict here?
+    // e.g. just pass in '$site->config->url' or s.th.l.th.
+    $data = array(
+      'config' => $this->config,
+      'request' => $this->getRequest(),
+    );
+    
+    // merge in additional data
+    foreach ($data_merge as $key => $val) {
+      $data[$key] = $val;
+    }
+    
+    // load template
+    $this->loadTemplate($template, $data);
+    
+  }
+  
 }
 
 ?>
\ No newline at end of file