Moved how assets get served

[cx.git] / cx / cx.php

diff --git a/cx/cx.php b/cx/cx.php
index d54b3d4f12133e19af14f2169a948d4e8171b959..2881ba59fd116e0943d08210126516d99546c1af 100644 (file)
--- a/cx/cx.php
+++ b/cx/cx.php
@@ -67,6 +67,12 @@ function cx_route($path) {
        if (count($path_components) == 0) {
                $template = 'list';
                $template_variables['page_number'] = 0;
        if (count($path_components) == 0) {
                $template = 'list';
                $template_variables['page_number'] = 0;

+       } else if (cx_template_has_content('public', $path)) {
+               cx_template_output_content('public', $path);
+               exit(0);
+       } else if (cx_template_has_content('admin', $path)) {
+               cx_template_output_content('admin', $path);
+               exit(0);

        } else if (count($path_components) >= 1 && $path_components[0] == 'feed') {
                header('Content-type: application/atom+xml;');
                $template = 'atom';
        } else if (count($path_components) >= 1 && $path_components[0] == 'feed') {
                header('Content-type: application/atom+xml;');
                $template = 'atom';


@@ -126,15 +132,15 @@ function cx_route($path) {
                                        if (isset($slug) == false) $slug = null;
                                        $date = cx_form_input_sanitized_date_time('post_date');
                                        if (isset($date) == false) $date = null;
                                        if (isset($slug) == false) $slug = null;
                                        $date = cx_form_input_sanitized_date_time('post_date');
                                        if (isset($date) == false) $date = null;

-                                       $page = cx_form_input_sanitized('post_is_page') == 'page';
-                                       $draft = cx_form_input_sanitized('post_is_draft') == 'draft';
+                                       $is_page = cx_form_input_sanitized('post_is_page') == 'page';
+                                       $is_draft = cx_form_input_sanitized('post_is_draft') == 'draft';

                                        $data = cx_form_input_sanitized_allowing_html('post_data');
                                        
                                        if (isset($_GET['id']) == false or $_GET['id'] == 0) {
                                        $data = cx_form_input_sanitized_allowing_html('post_data');
                                        
                                        if (isset($_GET['id']) == false or $_GET['id'] == 0) {

-                                               cx_posts_add_post(1, $title, $slug, $date, $page, $draft, $data);
+                                               cx_posts_add_post(1, $title, $slug, $date, $is_page, $is_draft, $data);

                                        } else {
                                                $id = $_GET['id'];
                                        } else {
                                                $id = $_GET['id'];

-                                               cx_posts_update_post($id, $title, $slug, $date, $page, $draft, $data);
+                                               cx_posts_update_post($id, $title, $slug, $date, $is_page, $is_draft, $data);

                                        }
                                        
                                        cx_http_redirect(cx_url_admin('/'));
                                        }
                                        
                                        cx_http_redirect(cx_url_admin('/'));


@@ -176,7 +182,7 @@ function cx_route($path) {
                        $page_id = cx_posts_find_page_id($slug);
                        if ($page_id) {
                                $template = 'post';
                        $page_id = cx_posts_find_page_id($slug);
                        if ($page_id) {
                                $template = 'post';

-                               $template_variables['post_id'] = cx_posts_find_page_id($slug);
+                               $template_variables['post_id'] = $page_id;

                        }
                }
 
                        }
                }
 


@@ -187,7 +193,7 @@ function cx_route($path) {
                        $post_id = cx_posts_find_article_id($slug);
                        if ($post_id) {
                                $template = 'post';
                        $post_id = cx_posts_find_article_id($slug);
                        if ($post_id) {
                                $template = 'post';

-                               $template_variables['post_id'] = cx_posts_find_article_id($slug);
+                               $template_variables['post_id'] = $post_id;

                        }
                }
        }
                        }
                }
        }