use repository and file classes

3 files changed, 39 insertions, 26 deletions

diff --git a/www/display.php b/www/display.php
index 5bd06bb..b6b7d7f 100644
--- a/www/display.php
+++ b/www/display.php
@@ -1,23 +1,14 @@
 <?php
+namespace Phorkie;
 /**
  * Display paste contents
- *
  */
 require_once 'www-header.php';
 
-if (!isset($_GET['id'])) {
-    errout(400, 'Paste ID missing');
-}
-if (!is_numeric($_GET['id'])) {
-    errout(400, 'Paste ID not numeric');
-}
-$id = (int)$_GET['id'];
-$repoDir = $GLOBALS['phorkie']['cfg']['repos'] . '/' . $id;
-if (!is_dir($repoDir)) {
-    errout(404, 'Paste not found');
-}
+$repo = new Repository();
+$repo->loadFromRequest();
 
-$files = glob($repoDir . '/*');
+/*
 $tplFiles = array();
 foreach ($files as $file) {
     $tplFile = array();
@@ -28,15 +19,19 @@ foreach ($files as $file) {
     $tplFile['raw'] = '/' . $id . '/raw/' . $tplFile['filename'];
     $tplFiles[] = $tplFile;
 }
+*/
 
 render(
     'display',
     array(
+        'repo' => $repo,
+        /*
         'description' => file_get_contents($repoDir . '/.git/description'),
         'files' => $tplFiles,
         'links' => array(
             'edit' => '/' . $id . '/edit'
         )
+        */
     )
 );
 ?>
diff --git a/www/index.php b/www/index.php
index 5276bf2..31aef7d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,4 +1,5 @@
 <?php
+namespace Phorkie;
 /**
  * Show paste creation form
  *
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