1 files changed, 30 insertions, 13 deletions

diff --git a/www/www-header.php b/www/www-header.php
index 28607da..8b99234 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,11 +1,38 @@
 <?php
+namespace Phorkie;
+set_include_path(
+    __DIR__ . '/../src/'
+    . PATH_SEPARATOR . get_include_path()
+);
+spl_autoload_register(
+    function ($class) {
+        $file = str_replace(array('\\', '_'), '/', $class) . '.php';
+        $hdl = @fopen($file, 'r', true);
+        if ($hdl !== false) {
+            fclose($hdl);
+            require $file;
+        }
+    }
+);
+set_exception_handler(
+    function ($e) {
+        if ($e instanceof Exception) {
+            header('HTTP/1.0 ' . $e->httpStatusCode);
+        } else {
+            header('HTTP/1.0 500 Internal server error');
+        }
+        render('exception', array('exception' => $e));
+        exit();
+    }
+);
+
 require_once __DIR__ . '/../data/config.default.php';
 require_once 'VersionControl/Git.php';
 require_once 'Twig/Autoloader.php';
-Twig_Autoloader::register();
+\Twig_Autoloader::register();
 
-$loader = new Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);
-$twig = new Twig_Environment(
+$loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);
+$twig = new \Twig_Environment(
     $loader,
     array(
         //'cache' => '/path/to/compilation_cache',
@@ -23,14 +50,4 @@ function redirect($target)
     header('Location: /' . $target);
     exit();
 }
-function errout($statusCode, $message)
-{
-    header('HTTP/1.0 ' . $statusCode);
-    echo $message;
-    exit();
-}
-function get_type_from_file($file)
-{
-    return substr($file, strrpos($file, '.') + 1);
-}
 ?>
\ No newline at end of file