From 1471fe7ccc480884d90cb91d3577fcd0150cab8c Mon Sep 17 00:00:00 2001 From: danpros Date: Mon, 18 Nov 2024 15:35:29 +0700 Subject: [PATCH] Clean up --- system/admin/views/layout.html.php | 5 -- system/htmly.php | 80 ++---------------------------- system/includes/dispatch.php | 10 ++++ 3 files changed, 13 insertions(+), 82 deletions(-) diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php index f88b1cf..47a11dc 100644 --- a/system/admin/views/layout.html.php +++ b/system/admin/views/layout.html.php @@ -22,11 +22,6 @@ if (isset($author[0])) { } else { $author = default_profile($user); } -if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); -} ?> ">
diff --git a/system/htmly.php b/system/htmly.php index 8d8d406..b1c47c1 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -19,16 +19,12 @@ if (config('timezone')) { // Publish scheduled post publish_scheduled(); +// Get search query. Redir to /search/ +get_search_query(); + // The front page of the blog get('/index', function () { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -240,13 +236,6 @@ post('/login', function () { // Show the author page get('/author/:name', function ($name) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -2805,13 +2794,6 @@ get('/admin/categories/:category', function ($category) { // Show the category page get('/category/:category', function ($category) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -3070,13 +3052,6 @@ post('/category/:category/delete', function () { // Show the type page get('/type/:type', function ($type) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -3166,13 +3141,6 @@ get('/type/:type/feed', function ($type) { // Show the tag page get('/tag/:tag', function ($tag) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -3258,13 +3226,6 @@ get('/tag/:tag/feed', function ($tag) { // Show the archive page get('/archive/:req', function ($req) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -3372,13 +3333,6 @@ get('/archive/:req/feed', function ($req) { // Show the search page get('/search/:keyword', function ($keyword) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (!login()) { file_cache($_SERVER['REQUEST_URI']); } @@ -3499,13 +3453,6 @@ get('/feed/opml', function () { // Show blog post without year-month get('/'. permalink_type() .'/:name', function ($name) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (permalink_type() == 'default') { $post = find_post(null, null, $name); if (is_null($post)) { @@ -3919,13 +3866,6 @@ post('/'. permalink_type() .'/:name/delete', function () { // Show various page (top-level), admin, login, sitemap, static page. get('/:static', function ($static) { - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } - if (strpos($static, ".xml") !== false) { if ($static === 'sitemap.xml') { $sitemap = 'index.xml'; @@ -4398,13 +4338,6 @@ post('/:static/delete', function () { // Show the sb static page get('/:static/:sub', function ($static, $sub) { - - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } if ($static === 'front') { $redir = site_url(); @@ -4689,13 +4622,6 @@ post('/:static/:sub/delete', function () { // Show blog post with year-month get('/:year/:month/:name', function ($year, $month, $name) { - - if (isset($_GET['search'])) { - $search = _h($_GET['search']); - $url = site_url() . 'search/' . remove_accent($search); - header("Location: $url"); - die; - } if (permalink_type() !== 'default') { $redir = site_url() . permalink_type() . '/' . $name; diff --git a/system/includes/dispatch.php b/system/includes/dispatch.php index 4a734ec..29dcc5a 100644 --- a/system/includes/dispatch.php +++ b/system/includes/dispatch.php @@ -131,6 +131,16 @@ function save_config($data = array(), $new = array()) return file_put_contents($config_file, $string, LOCK_EX); } +function get_search_query() +{ + if (isset($_GET['search'])) { + $search = _h($_GET['search']); + $url = site_url() . 'search/' . remove_accent($search); + header("Location: $url"); + die; + } +} + function to_b64($str) { $str = base64_encode($str);