mirror of
https://github.com/danpros/htmly.git
synced 2026-04-18 11:36:20 +05:30
Change views ID to slug
Blog post: post_slug Page: page_slug Subpage: subpage_parentSlug.slug
This commit is contained in:
parent
265bf2c11b
commit
dc742ea2a1
4 changed files with 136 additions and 140 deletions
|
|
@ -2532,24 +2532,21 @@ get('/post/:name', function ($name) {
|
|||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
} else {
|
||||
add_view('post_' . $name);
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$post = find_post(null, null, $name);
|
||||
|
||||
if (is_null($post)) {
|
||||
not_found();
|
||||
not_found('post_' . $name);
|
||||
} else {
|
||||
$current = $post['current'];
|
||||
}
|
||||
|
||||
if (config("views.counter") == "true") {
|
||||
add_view($current->file);
|
||||
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$author = new stdClass;
|
||||
$author->url = $current->authorUrl;
|
||||
$author->name = $current->authorName;
|
||||
|
|
@ -3047,12 +3044,17 @@ get('/:static', function ($static) {
|
|||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
} else {
|
||||
add_view('page_' . $static);
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$post = find_page($static);
|
||||
|
||||
if (!$post) {
|
||||
not_found();
|
||||
not_found('page_' . $static);
|
||||
}
|
||||
|
||||
if (array_key_exists('prev', $post)) {
|
||||
|
|
@ -3068,13 +3070,6 @@ get('/:static', function ($static) {
|
|||
}
|
||||
|
||||
$post = $post['current'];
|
||||
|
||||
if (config("views.counter") == "true") {
|
||||
add_view($post->file);
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$vroot = rtrim(config('views.root'), '/');
|
||||
|
||||
|
|
@ -3335,13 +3330,28 @@ get('/:static/:sub', function ($static, $sub) {
|
|||
$redir = site_url();
|
||||
header("location: $redir", TRUE, 301);
|
||||
}
|
||||
|
||||
if (config("views.counter") != "true") {
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
} else {
|
||||
add_view('subpage_' . $static.'.'.$sub);
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$parent_post = find_page($static);
|
||||
if (!$parent_post) {
|
||||
not_found();
|
||||
not_found('subpage_' . $static.'.'.$sub);
|
||||
}
|
||||
$post = find_subpage($static, $sub);
|
||||
|
||||
if (!$post) {
|
||||
not_found('subpage_' . $static.'.'.$sub);
|
||||
}
|
||||
|
||||
if (array_key_exists('prev', $post)) {
|
||||
$prev = $post['prev'];
|
||||
} else {
|
||||
|
|
@ -3354,18 +3364,7 @@ get('/:static/:sub', function ($static, $sub) {
|
|||
$next = array();
|
||||
}
|
||||
|
||||
if (!$post) {
|
||||
not_found();
|
||||
}
|
||||
$post = $post['current'];
|
||||
|
||||
if (config("views.counter") == "true") {
|
||||
add_view($post->file);
|
||||
}
|
||||
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
|
||||
$vroot = rtrim(config('views.root'), '/');
|
||||
|
||||
|
|
@ -3400,6 +3399,7 @@ get('/:static/:sub', function ($static, $sub) {
|
|||
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> » <a href="' . $parent_post['current']->url . '">' . $parent_post['current']->title . '</a> » ' . $post->title,
|
||||
'p' => $post,
|
||||
'static' => $post,
|
||||
'parent' => $parent_post,
|
||||
'prev' => static_prev($prev),
|
||||
'next' => static_next($next),
|
||||
'type' => 'subPage',
|
||||
|
|
@ -3582,24 +3582,21 @@ get('/:year/:month/:name', function ($year, $month, $name) {
|
|||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
} else {
|
||||
add_view('post_' . $name);
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$post = find_post($year, $month, $name);
|
||||
|
||||
if (is_null($post)) {
|
||||
not_found();
|
||||
not_found('post_'. $name);
|
||||
} else {
|
||||
$current = $post['current'];
|
||||
}
|
||||
|
||||
if (config("views.counter") == "true") {
|
||||
add_view($current->file);
|
||||
|
||||
if (!login()) {
|
||||
file_cache($_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
$author = new stdClass;
|
||||
$author->url = $current->authorUrl;
|
||||
$author->name = $current->authorName;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue