From 7c86464d643d642cace6a550bb4d675dc872a039 Mon Sep 17 00:00:00 2001 From: d47081 Date: Tue, 14 Mar 2023 02:23:13 +0200 Subject: [PATCH 1/6] fix merge errors --- README.md | 5 +---- public/index.php | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7e35bf8..954cafe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # kvazar-network webapp Web-oriented content exploring platform for Kevacoin Blockchain @@ -45,6 +44,4 @@ location @sef { ### examples #### yggdrasil -[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]) -======= ->>>>>>> master +[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]) \ No newline at end of file diff --git a/public/index.php b/public/index.php index 3970c11..a883419 100644 --- a/public/index.php +++ b/public/index.php @@ -1,4 +1,3 @@ -<<<<<<< HEAD >>>>>> master +} \ No newline at end of file From d9db8ac9f63bc3f0f390304e4f1b61ca212b80ee Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 1 Jul 2023 17:55:39 +0300 Subject: [PATCH 2/6] fix undefined rss variable --- public/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.php b/public/index.php index a883419..0f75e60 100644 --- a/public/index.php +++ b/public/index.php @@ -8,6 +8,7 @@ $query = isset($_GET['q']) ? preg_replace('/[^\w\s]+/u', '', urldecode($_GET['q' $ns = ''; $tx = ''; $page = 0; +$rss = false; if (isset($_SERVER['REQUEST_URI'])) { From d53f615df127a5b6a5dc3c9bc925eb9961587810 Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 12 Jul 2023 12:37:16 +0300 Subject: [PATCH 3/6] remove project name postfix --- config-default.php | 2 +- public/index.phtml | 2 +- public/robots.txt | 2 +- public/rss.phtml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-default.php b/config-default.php index e6bb98d..6d96782 100644 --- a/config-default.php +++ b/config-default.php @@ -6,7 +6,7 @@ ini_set('display_startup_errors', '1'); error_reporting(E_ALL); // Application -define('BASE_URL', 'https://kvazar.today/'); +define('BASE_URL', ''); define('PAGE_LIMIT', 10); define('CACHE_ENABLED', false); diff --git a/public/index.phtml b/public/index.phtml index 5bdd177..272085b 100755 --- a/public/index.phtml +++ b/public/index.phtml @@ -23,7 +23,7 @@ KVAZAR | SEARCH | <?php echo $query; ?> - KVAZAR | TODAY + KVAZAR diff --git a/public/robots.txt b/public/robots.txt index d08107c..114642d 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,2 +1,2 @@ User-Agent: * -Sitemap: https://kvazar.today/sitemap.xml +Sitemap: /sitemap.xml diff --git a/public/rss.phtml b/public/rss.phtml index 9a6b565..d9ddf3b 100644 --- a/public/rss.phtml +++ b/public/rss.phtml @@ -5,7 +5,7 @@ ($query ? '?q=' . $query . '&rss' : 'rss')); ?>" rel="self" type="application/rss+xml"> KVAZAR - <?php echo ($namespaceValue ? $namespaceValue : ($namespaceHash ? $namespaceHash : - ($query ? 'SEARCH - ' . $query : 'TODAY'))); ?> + ($query ? 'SEARCH - ' . $query : false))); ?> Observe Kevacoin Universe From 8878e384e0ddb9eb8fceffc9af22e4f7560e2dcd Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 12 Jul 2023 12:38:56 +0300 Subject: [PATCH 4/6] update rss --- public/rss.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/rss.phtml b/public/rss.phtml index d9ddf3b..0904057 100644 --- a/public/rss.phtml +++ b/public/rss.phtml @@ -1,5 +1,5 @@ - - + + From 9d686893dea0664c9f9e95d45ad1d439dfb94178 Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 23 Aug 2023 15:32:56 +0300 Subject: [PATCH 5/6] fix noindex,follow --- public/index.phtml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/index.phtml b/public/index.phtml index 272085b..b7f0cbb 100755 --- a/public/index.phtml +++ b/public/index.phtml @@ -4,20 +4,19 @@ - - + + + <?php echo $namespaceValue ? $namespaceValue : $ns; ?> | PART <?php echo $page; ?> | KVAZAR - <?php echo $namespaceValue ? $namespaceValue : $ns; ?> | KVAZAR KVAZAR | PART <?php echo $page; ?> - <?php echo $tx && isset($data[0]['key']) ? $data[0]['key'] : $tx; ?> | <?php echo ($namespaceValue ? $namespaceValue : ($namespaceHash ? $namespaceHash : false)); ?> | KVAZAR From 7da2caca924ca4bf7606ba104c06ca74f449899c Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 23 Aug 2023 15:40:12 +0300 Subject: [PATCH 6/6] fix relative paths --- public/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/index.php b/public/index.php index 0f75e60..94a4dac 100644 --- a/public/index.php +++ b/public/index.php @@ -1,8 +1,8 @@