From fdaf10a955615b65c8eb41e89725a57bdfca18c0 Mon Sep 17 00:00:00 2001
From: Gabriel Dunne <gdunne@quilime.com>
Date: Sun, 16 May 2010 17:49:29 -0700
Subject: [PATCH] re-structure

---
 index.php                      | 30 ++++--------------------------
 plog/lib/config                |  2 +-
 plog/lib/data.php              |  9 ++++++++-
 plog/templates/header-src.html |  2 +-
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/index.php b/index.php
index 9a64b05..c827ad9 100644
--- a/index.php
+++ b/index.php
@@ -1,29 +1,7 @@
 <?php
 
-    require_once 'lib/init.php';
-    
-    $url_string = get_url_string();
-    
-    if (is_string($url_string)) {
-    	
-    	if ( basename($url_string) == "aggregate") {
-	    	header ("Location: http://quilime.com/aggregate/index.php");
-	    	exit;
-    	}
-        else if (is_file ( TEMPLATE_DIR . basename($url_string) . '.html' )) {
-            include ( TEMPLATE_DIR . basename($url_string) . '.html' );
-            exit;
-        }
-        else if (dirname($url_string) != '.' && is_dir(CONTENT_DIR . dirname($url_string))) {
-            include( TEMPLATE_DIR . dirname($url_string) . '.html' );
-            exit;
-        }
-        else  {
-            include( TEMPLATE_DIR . '404.html' );            
-            exit;
-        }
-    }
-    
-    include ( TEMPLATE_DIR . 'index.html' );
-                                                                                                                 
+    require_once "plog/lib/init.php";
+        
+    include ( get_template_dir() . 'index.' . get_format() );
+
 ?>
diff --git a/plog/lib/config b/plog/lib/config
index ae63498..502caa6 100644
--- a/plog/lib/config
+++ b/plog/lib/config
@@ -1,4 +1,4 @@
 LOCAL_ROOT      = /home/quilime/quilime.com/
 CONTENT_DIR     = c/
-TEMPLATE_DIR    = templates/
+TEMPLATE_DIR    = plog/templates/
 SITE_TITLE      = quilime
diff --git a/plog/lib/data.php b/plog/lib/data.php
index 6d0f23d..dc44695 100644
--- a/plog/lib/data.php
+++ b/plog/lib/data.php
@@ -90,7 +90,14 @@
         }        
     }    
     
-    
+
+function get_format() {
+  return 'html';
+}
+
+function get_template_dir() {
+  return "plog/templates/";
+}
 
 
 ?>
\ No newline at end of file
diff --git a/plog/templates/header-src.html b/plog/templates/header-src.html
index 3d232c2..05d8973 100644
--- a/plog/templates/header-src.html
+++ b/plog/templates/header-src.html
@@ -1,7 +1,7 @@
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">    
 
-<link rel="stylesheet" href="<?= get_base_dir(); ?>/css/style.css" type="text/css">
+<link rel="stylesheet" href="<?= get_template_dir(); ?>css/style.css" type="text/css">
 
 <script type="text/javascript" src="<?= get_base_dir(); ?>/js/jquery-1.3.2.min.js"></script>
 
-- 
2.34.1