Working on Local install

diff --git a/index.php b/index.php
index 181841a0d7bff69d4211472794d4e258dc0f1067..b4179b37a97c57af0edde7afabdc8800334874de 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,55 +1,55 @@
 <?php
 
-require_once 'lib/init.php';
+require 'lib/init.php';
 
-$url = get_url();
-list($response_format, $response_mime_type) = parse_format($url['extension'], 'html');
+$request = get_request();
+$template = 'default.html.tpl';
 
-# setup template
-$t = get_template_instance();
-$t->response_format = $response_format;
-$t->assign('view', isset($_GET['v']) ? $_GET['v'] : null);
+$v = new View  ( $request );
+$m = new Model ( $request );
 
-$content_request = LOCAL_ROOT. '/' . CONTENT_DIR . '/' . $url['dirname'] . '/' . $url['filename'];
-$page_request =  LOCAL_ROOT . '/' . PAGE_DIR . '/' . $url['filename'];
-$total = 0;
+list($response_format, $response_mime_type) = parse_format($request['extension'], 'html');
 
+echo '<pre>';
+exit(print_r($request));
 
-if ($url['filename'] == 'index')
-{
-    $template = 'index.html.tpl';
-}
-else if (is_dir($content_request)) {
+$content_request = join(array(LOCAL_ROOT, CONTENT_DIR, $request['dirname'], $request['filename']), DIRECTORY_SEPARATOR );
+$page_request = join(array(LOCAL_ROOT, PAGE_DIR, $request['filename']), DIRECTORY_SEPARATOR );
+
+# multiple entries
+if (is_dir($content_request)) {
     # get config in folder, if exists
     if (is_file($content_request . '/' . CONFIG_FILE )) {
         $config = parse_entry(new SplFileInfo($content_request . '/' . CONFIG_FILE));
         $template = $config['config']['template'] . '.' . $response_format . '.tpl' ;
     }
-    list($data, $total) = get_entries($url['dirname'] . '/' . $url['filename']);
-    $t->assign('data', $data);
-    $t->assign('page_title', preg_replace('{^/|/$}', '', $url['url']));
+    list($data, $total) = get_entries($request['dirname'] . '/' . $request['filename']);
+    $v->assign('data', $data);
+    $v->assign('page_title', preg_replace('{^/|/$}', '', $request['url']));
 }
 
-# content exists, and is a single entry
+# single entry
 else if (is_file($content_request)) {
-    $t->assign('data', parse_entry(new SplFileInfo($content_request)));
-    $t->assign('single', true);
+    $v->assign('data', parse_entry(new SplFileInfo($content_request)));
+    $v->assign('single', true);
     $template = 'single.'.$response_format.'.tpl';
 }
 
-# content exists, and is a page
+# page
 else if (is_file($page_request)) {
     $page = parse_entry(new SplFileInfo($page_request), 1);
-    $t->assign('data', $page);
+    $v->assign('data', $page);
     $template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
 }
-
-# 404
+else if ($request['filename'] == 'index')
+{
+    $template = 'index.html.tpl';
+}
 else {
     $template = '404.html.tpl';
 }
 
-# render
-$t->assign('total', $total);
-header("Content-Type: {$response_mime_type}; charset=UTF-8");
-$t->render($template);
+$v->assign( 'total', isset($total) ? $total : 0 );
+
+header("Content-Type: {$response_mime_type}; charset=UTF-8"); 
+$v->render( $template ); 

diff --git a/lib/init.php b/lib/init.php
index 6f0205a02445373ed169e8fb321bb16a52cfb6eb..a09cb34b0f75a19c5987df9c29744f748d7d9f85 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,7 +1,13 @@
 <?php
 
-//  NOTE
-//  short tags must be enabled
+/**
+ *             SETUP
+ *
+ *             update variables specific to your server
+ *
+ *             note: PHP short tags must be enabled
+ */
+
 
 # error reporting
 error_reporting(E_ALL);
@@ -26,10 +32,9 @@ define ('MORE_DELIM',                '<!--more-->');
 define ('TITLE_DELIMITER',     ': ');
 define ('CONFIG_FILE',                 'config');
 
-
-
 # includes
 require_once 'data.php';
 require_once 'output.php';
 require_once 'markdown.php';
-require_once 'template.php';
+require_once 'model.php';
+require_once 'view.php';

diff --git a/lib/model.php b/lib/model.php
new file mode 100644 (file)
index 0000000..24680d5
--- /dev/null
+++ b/lib/model.php
@@ -0,0 +1,9 @@
+<?php
+
+class Model
+{      
+
+       function __construct()
+       {
+       }
+}

diff --git a/lib/output.php b/lib/output.php
index 9046fb85a9d89a8a5bf5a889eb91fe45201fbba5..6db7d4bd3b973474fcb439e70e818f83d6e48a84 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -1,18 +1,5 @@
 <?php
 
-
-/**
- *     return new template instance
- */
-function get_template_instance()
-{
-    $t = new Template();
-    $t->template_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR));
-    $t->template_cache_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR, 'cache'));
-
-    return $t;
-}
-
 /**
  *     @param format
  *  @param default format
@@ -169,7 +156,7 @@ function get_url_parts()
 }
 
 
-function get_url()
+function get_request()
 {
     $path_info = pathinfo( $_SERVER['SCRIPT_NAME'] );
     $path_info['url'] = preg_match("/\.\.\//", $_SERVER['SCRIPT_NAME']) ? '/' : $_SERVER['SCRIPT_NAME'];

diff --git a/lib/template.php b/lib/view.php
similarity index 62%
rename from lib/template.php
rename to lib/view.php
index c3f379cd4b99b8aa9a679ee57bcc2a69d0c99f1e..bbd8e17c18801a9aa457d0c546f740e736c4dbe5 100644 (file)
--- a/lib/template.php
+++ b/lib/view.php
@@ -1,18 +1,21 @@
 <?php
 
-class Template
+/**
+ *     template object (view)
+ */
+class View
 {      
        var $template_dir = 'templates';
-       var $template_cache_dir = 'cache';
-       var $cachr_file = null;
+       // var $template_cache_dir = 'cache';
        var $response_format = 'html';
-       var $caching = 1;
-       
-       var $_tpl_vars = array();
+       var $response_mime_type = 'text/html';
 
+       var $_tpl_vars = array();
 
        function __construct()
        {
+       $this->template_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR));
+       $this->template_cache_dir = join(DIRECTORY_SEPARATOR, array(dirname(__FILE__), '..', TEMPLATE_DIR, 'cache'));           
        }
        
        
@@ -32,18 +35,14 @@ class Template
        public function include_template ($template, $vars = array())
        {
                $this->_tpl_vars = array_merge($this->_tpl_vars, $vars);
-               $this->render($template);
+               $this->render( $template );
        }
        
 
-       public function render( $template )
+       public function render( $template ) 
        {
                extract( $this->_tpl_vars );
-
-               if (is_file( $this->template_dir . DIRECTORY_SEPARATOR . $template ))
-                       include( $this->template_dir . DIRECTORY_SEPARATOR . $template );
-               else
-                       include( $this->template_dir . DIRECTORY_SEPARATOR . 'default.' . $this->response_format . '.tpl');
+               include( $this->template_dir . DIRECTORY_SEPARATOR . $template );
        }