FbIN/htmly
1
0
Fork 0
mirror of https://github.com/danpros/htmly.git synced 2026-04-18 03:26:20 +05:30
Code Issues Projects Releases Packages Wiki Activity

Cleaning up

Browse source
This commit is contained in:
danpros 2024-03-03 07:59:29 +07:00
commit dd0e16acf3
10 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
system/admin/admin.php
View file

@ -1010,7 +1010,9 @@ function find_draft_page($static = null)
$tmp = array();
if (config('views.counter') == 'true') {
$counter = config('views.counter');
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -1052,7 +1054,7 @@ function find_draft_page($static = null)
// Get the contents and convert it to HTML
$post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('page_' . $post->slug, $post->file, $views);
} else {
$post->views = null;
@ -1078,7 +1080,9 @@ function find_draft_subpage($static = null, $sub_static = null)
$tmp = array();
if (config('views.counter') == 'true') {
$counter = config('views.counter');
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -1129,7 +1133,7 @@ function find_draft_subpage($static = null, $sub_static = null)
// Get the contents and convert it to HTML
$post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('subpage_' . $post->parentSlug .'.'. $post->slug, $post->file, $views);
} else {
$post->views = null;

32
system/includes/functions.php
View file

@ -394,8 +394,12 @@ function get_posts($posts, $page = 1, $perpage = 0)
$posts = array_slice($posts, ($page - 1) * $perpage, $perpage);
$cList = category_list(true);
if (config('views.counter') == 'true') {
$auto = config('toc.automatic');
$counter = config('views.counter');
$caption = config('fig.captions');
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -535,18 +539,17 @@ function get_posts($posts, $page = 1, $perpage = 0)
if (isset($toc['1'])) {
$post->body = insert_toc('post-' . $post->date, $toc['0'], $toc['1']);
} else {
$auto = config('toc.automatic');
if ($auto === 'true') {
$post->body = automatic_toc($post->body, 'post-' . $post->date);
}
}
// Convert image tags to figures
if (config('fig.captions') == 'true') {
if ($caption == 'true') {
$post->body = preg_replace( '/<p>(<img .*?alt="(.*?)"\s*\/>)<\/p>/', '<figure>$1<figcaption>$2</figcaption></figure>', $post->body );
}
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('post_' . $post->slug, $post->file, $views);
} else {
$post->views = null;
@ -565,8 +568,11 @@ function get_pages($pages, $page = 1, $perpage = 0)
}
$tmp = array();
$auto = config('toc.automatic');
$counter = config('views.counter');
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -616,13 +622,12 @@ function get_pages($pages, $page = 1, $perpage = 0)
if (isset($toc['1'])) {
$post->body = insert_toc('page-' . $post->slug, $toc['0'], $toc['1']);
} else {
$auto = config('toc.automatic');
if ($auto === 'true') {
$post->body = automatic_toc($post->body, 'page-' . $post->slug);
}
}
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('page_' . $post->slug, $post->file, $views);
} else {
$post->views = null;
@ -642,8 +647,11 @@ function get_subpages($sub_pages, $page = 1, $perpage = 0)
}
$tmp = array();
$auto = config('toc.automatic');
$counter = config('views.counter');
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$viewsFile = "content/data/views.json";
if (file_exists($viewsFile)) {
$views = json_decode(file_get_contents($viewsFile), true);
@ -703,13 +711,12 @@ function get_subpages($sub_pages, $page = 1, $perpage = 0)
if (isset($toc['1'])) {
$post->body = insert_toc('subpage-' . $post->slug, $toc['0'], $toc['1']);
} else {
$auto = config('toc.automatic');
if ($auto === 'true') {
$post->body = automatic_toc($post->body, 'subpage-' . $post->slug);
}
}
if (config('views.counter') == 'true') {
if ($counter == 'true') {
$post->views = get_views('subpage_' . $post->parentSlug .'.'. $post->slug, $post->file, $views);
} else {
$post->views = null;
@ -2210,6 +2217,7 @@ function get_teaser($string, $url = null, $char = null)
{
$teaserType = config('teaser.type');
$more = config('read.more');
$behave = config('teaser.behave');
if(empty($more)) {
$more = 'Read more';
@ -2231,7 +2239,7 @@ function get_teaser($string, $url = null, $char = null)
return $string;
}
} else {
if (config('teaser.behave') === 'check') {
if ($behave === 'check') {
$readMore = explode('<!--more-->', $string);
if (isset($readMore['1'])) {
$string = shorten($readMore[0]);