Moved how assets get served

[cx.git] / cx / lib / posts.php

diff --git a/cx/lib/posts.php b/cx/lib/posts.php
index 2c2dc821e811bfc0fe94d66823a28f0af7940ce3..e46aa28cd6816f79a5827f5c7fe17a6f8fecd198 100644 (file)
--- a/cx/lib/posts.php
+++ b/cx/lib/posts.php
@@ -2,21 +2,15 @@
 
 cx_require('lib', 'db.php');
 cx_require('lib', 'setup.php');
 
 cx_require('lib', 'db.php');
 cx_require('lib', 'setup.php');

-cx_require('third_party', 'parsedown', 'Parsedown.php');
-
-function mk_markdown($markdown) {
-       static $Parsedown = new Parsedown();
-
-       return $Parsedown->text($markdown);
-}
+cx_require('lib', 'markdown.php');

 
 class PostMetadata {
        public $hero_image;
        public $hero_image_alt;
 
        public function __construct($dict) {
 
 class PostMetadata {
        public $hero_image;
        public $hero_image_alt;
 
        public function __construct($dict) {

-               $this->hero_image = $dict['post_hero_image'];
-               $this->hero_image_alt = $dict['post_hero_image_alt'];
+               $this->hero_image = isset($dict['post_hero_image']) ? $dict['post_hero_image'] : null;
+               $this->hero_image_alt = isset($dict['post_hero_image_alt']) ? $dict['post_hero_image_alt'] : null;

        }
 }
 
        }
 }
 


@@ -25,6 +19,7 @@ class Post {
        public $title;
        public $slug;
        public $date;
        public $title;
        public $slug;
        public $date;

+       public $is_page;

        public $is_draft;
        public $data;
        public $html_content;
        public $is_draft;
        public $data;
        public $html_content;


@@ -35,15 +30,16 @@ class Post {
                $this->title = $dict['post_title'];
                $this->slug = $dict['post_slug'];
                $this->date = $dict['post_date'];
                $this->title = $dict['post_title'];
                $this->slug = $dict['post_slug'];
                $this->date = $dict['post_date'];

+               $this->is_page = $dict['post_is_page'];

                $this->is_draft = $dict['post_is_draft'];
                $this->data = $dict['post_data'];
                $this->is_draft = $dict['post_is_draft'];
                $this->data = $dict['post_data'];

-               $this->html_content = mk_markdown($this->data);
+               $this->html_content = cx_markdown_generate_html($this->data);

                $this->html_excerpt = null;
 
                // Read more...
                $segments = explode('---', $this->data, 2);
                if (count($segments) > 1) {
                $this->html_excerpt = null;
 
                // Read more...
                $segments = explode('---', $this->data, 2);
                if (count($segments) > 1) {

-                       $this->html_excerpt = mk_markdown($segments[0]);
+                       $this->html_excerpt = cx_markdown_generate_html($segments[0]);

                }
        }
 
                }
        }
 


@@ -77,7 +73,7 @@ function cx_post_make_slug($title) {
        return $slug;
 }
 
        return $slug;
 }
 

-function cx_posts_add_post($site_id, $title, $slug, $date, $draft, $data) {
+function cx_posts_add_post($site_id, $title, $slug, $date, $page, $draft, $data) {

        $creation_time = $update_time = time();
        
        if ($slug == null) {
        $creation_time = $update_time = time();
        
        if ($slug == null) {


@@ -100,10 +96,10 @@ function cx_posts_add_post($site_id, $title, $slug, $date, $draft, $data) {
                        post_data,
                        post_data_version)
                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
                        post_data,
                        post_data_version)
                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';

-       cx_db_exec($sql, $site_id, $creation_time, $update_time, $slug, $date, false, $draft, $title, $data, 1);
+       cx_db_exec($sql, $site_id, $creation_time, $update_time, $slug, $date, $page, $draft, $title, $data, 1);

 }
 
 }
 

-function cx_posts_update_post($post_id, $title, $slug, $date, $draft, $data) {
+function cx_posts_update_post($post_id, $title, $slug, $date, $page, $draft, $data) {

        $update_time = time();
        
        if ($slug == null) {
        $update_time = time();
        
        if ($slug == null) {


@@ -118,12 +114,13 @@ function cx_posts_update_post($post_id, $title, $slug, $date, $draft, $data) {
                SET post_update_time = ?,
                post_slug = ?,
                post_date = ?,
                SET post_update_time = ?,
                post_slug = ?,
                post_date = ?,

+               post_is_page = ?,

                post_is_draft = ?,
                post_title = ?,
                post_data = ?
                WHERE post_id == ?;';
                //LIMIT 1;';
                post_is_draft = ?,
                post_title = ?,
                post_data = ?
                WHERE post_id == ?;';
                //LIMIT 1;';

-       cx_db_exec($sql, $update_time, $slug, $date, $draft, $title, $data, $post_id);
+       cx_db_exec($sql, $update_time, $slug, $date, $page, $draft, $title, $data, $post_id);

 }
 
 function cx_posts_delete_post($post_id) {
 }
 
 function cx_posts_delete_post($post_id) {


@@ -133,11 +130,12 @@ function cx_posts_delete_post($post_id) {
        cx_db_exec($sql, $post_id);
 }
 
        cx_db_exec($sql, $post_id);
 }
 

-function cx_posts_get(int $limit = 0, bool $include_drafts = false) {
+function cx_posts_get(int $limit = 0, int $offset = 0, bool $include_drafts = false) {

        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,
        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,

+               post_is_page,

                post_is_draft,
                post_title,
                post_data
                post_is_draft,
                post_title,
                post_data


@@ -153,6 +151,10 @@ function cx_posts_get(int $limit = 0, bool $include_drafts = false) {
        if ($limit > 0) {
                $sql .= ' LIMIT ' . $limit;
        }
        if ($limit > 0) {
                $sql .= ' LIMIT ' . $limit;
        }

+       
+       if ($offset > 0) {
+               $sql .= ' OFFSET ' . $offset;
+       }

 
        $sql .= ';';
 
 
        $sql .= ';';
 


@@ -162,17 +164,37 @@ function cx_posts_get(int $limit = 0, bool $include_drafts = false) {
        }
 }
 
        }
 }
 

+function cx_posts_count(bool $include_drafts = false) {
+       $sql = 'SELECT
+               COUNT(post_id) AS _count
+               FROM posts
+               WHERE post_is_page == FALSE';
+       
+       if ($include_drafts == false) {
+               $sql .= ' AND post_is_draft == FALSE';
+       }
+
+       $sql .= ';';
+
+
+       foreach (cx_db_query($sql) as $count_details) {
+               return $count_details['_count'];
+       }
+
+       return 0;
+}
+

 function cx_posts_find_post($post_id) {
        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,
 function cx_posts_find_post($post_id) {
        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,

+               post_is_page,

                post_is_draft,
                post_title,
                post_data
                FROM posts
                post_is_draft,
                post_title,
                post_data
                FROM posts

-               WHERE post_is_page == FALSE
-               AND post_id == ?
+               WHERE post_id == ?

                LIMIT 1;';
 
        foreach (cx_db_query($sql, $post_id) as $post) {
                LIMIT 1;';
 
        foreach (cx_db_query($sql, $post_id) as $post) {


@@ -183,11 +205,13 @@ function cx_posts_find_post($post_id) {
        return null;
 }
 
        return null;
 }
 

-function cx_posts_find_post_id($post_slug) {
+function cx_posts_find_article_id($post_slug) {

        $sql = 'SELECT
                post_id
                FROM posts
                WHERE post_slug == ?
        $sql = 'SELECT
                post_id
                FROM posts
                WHERE post_slug == ?

+               AND post_is_page == FALSE
+               AND post_is_draft == FALSE

                LIMIT 1;';
 
        foreach (cx_db_query($sql, $post_slug) as $post) {
                LIMIT 1;';
 
        foreach (cx_db_query($sql, $post_slug) as $post) {


@@ -197,18 +221,41 @@ function cx_posts_find_post_id($post_slug) {
        return null;
 }
 
        return null;
 }
 

-function cx_pages_get() {
+function cx_posts_find_page_id($post_slug) {
+       $sql = 'SELECT
+               post_id
+               FROM posts
+               WHERE post_slug == ?
+               AND post_is_page == TRUE
+               AND post_is_draft == FALSE
+               LIMIT 1;';
+
+       foreach (cx_db_query($sql, $post_slug) as $post) {
+               return $post['post_id'];
+       }
+
+       return null;
+}
+
+function cx_pages_get(bool $include_drafts = false) {

        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,
        $sql = 'SELECT
                post_id,
                post_slug,
                post_date,

+               post_is_page,

                post_is_draft,
                post_title,
                post_data
                FROM posts
                post_is_draft,
                post_title,
                post_data
                FROM posts

-               WHERE post_is_page == TRUE
-               AND post_is_draft == FALSE
-               ORDER BY post_creation_time DESC;';
+               WHERE post_is_page == TRUE';
+
+       if ($include_drafts == false) {
+               $sql .= ' AND post_is_draft == FALSE';
+       }
+
+       $sql .= ' ORDER BY post_date ASC';
+
+       $sql .= ';';

 
        foreach (cx_db_query($sql) as $post) {
                $p = new Post($post);
 
        foreach (cx_db_query($sql) as $post) {
                $p = new Post($post);