new index file

diff --git a/public/index.php b/public/index.php
index f73f29e5e525672840eafe136ac4d2f4a8f80a95..ba03ff2f2d9e767a5cd03a151be2a7b12f9613a6 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -4,42 +4,40 @@
 
     $url_parts = get_url();
 
-       list($response_format, $response_mime_type) = parse_format($url_parts['extension'], 'html');    
-       
-       $t = get_template_instance();   
-       $t->response_format = $response_format;
-       $t->assign('view', $_GET['v']);
-               
-       # content folder
-       if (is_dir(LOCAL_ROOT . CONTENT_DIR . DIRECTORY_SEPARATOR . $url_parts['url']) && $url_parts['url'] != "/") {
-               list($data, $total) = get_data(array($url_parts['url']));
-               $t->assign('page_title', preg_replace('{^/|/$}', '', $url_parts['url']));
-               $t->assign('data', $data);              
-       }
-       # single file
-       else if (is_file( LOCAL_ROOT . CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename'])) {
-               $t->assign('single', true);
-               $t->assign('data', parse_file(LOCAL_ROOT . CONTENT_DIR . $url_parts['dirname'] . DIRECTORY_SEPARATOR . $url_parts['filename']));
-               $template = 'single.'.$response_format.'.tpl';          
-       }
-       # page
-       else if (is_file( LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] )) {
-               $t->assign('data', parse_file(LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename']));
-               $template = 'page.' . $response_format . '.tpl';
-       }
-       # direct template
-       else if (is_file( LOCAL_ROOT . TEMPLATE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'] .'.'. $response_format . '.tpl')) {
-               $template = $url_parts['filename'] . '.' . $response_format . '.tpl';           
-       }
-       # default (index)
-       else {
-               list($data, $total) = get_data();
-               $t->assign('data', $data);              
-       }
-       
-       
-       # render template
-       $t->assign('total', $total);    
+    list($response_format, $response_mime_type) = parse_format($url_parts['extension'], 'html');    
+    
+    # setup template
+    $t = get_template_instance();    
+    $t->response_format = $response_format;
+    $t->assign('view', $_GET['v']);
+    
+    # is folder
+    if (is_dir(LOCAL_ROOT . CONTENT_DIR . $url_parts['url']) && $url_parts['url'] != "/") {
+        list($data, $total) = get_entries($url_parts['url']);
+        $t->assign('page_title', preg_replace('{^/|/$}', '', $url_parts['url']));        
+        $t->assign('data', $data);        
+    }
+    # is file
+    else if (is_file( LOCAL_ROOT . CONTENT_DIR . $url_parts['url'])) {
+        $t->assign('single', true);        
+        $t->assign('data', parse_entry(new SplFileInfo(LOCAL_ROOT . CONTENT_DIR . $url_parts['url'])));
+        $template = 'single.'.$response_format.'.tpl';        
+    }
+    # is page
+    else if (is_file( LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename'])) {
+        $page = parse_entry(new SplFileInfo(LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url_parts['filename']), 1);
+        $t->assign('data', $page);
+        $template = $page['config']['template'] ? $page['config']['template'] . '.' . $response_format . '.tpl' : 'page.' . $response_format . '.tpl';
+    }
+    # default (all entries)
+    else {
+        list($data, $total) = get_entries();
+        $t->assign('data', $data);        
+    }
+    
+    # render
+    $t->assign('total', $total);    
     header("Content-Type: {$response_mime_type}; charset=UTF-8");
-       $t->render($template);
+    $t->render($template);
+    
 ?>