From 2a6d94fc5e8bf94b815b9bbc260a8f2ca6d6c318 Mon Sep 17 00:00:00 2001
From: danpros <dan@danpros.com>
Date: Wed, 3 Jan 2024 23:51:59 +0700
Subject: [PATCH] Improvements

---
 index.php                     |  3 +-
 system/htmly.php              |  5 ++--
 system/includes/functions.php | 67 ++++++++++++++++++-------------------------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/index.php b/index.php
index 670b8da..94b3cf8 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,6 @@
 <?php
 define('HTMLY', true);
+define('HTMLY_VERSION', 'v2.8.9');
 $config_file = 'config/config.ini';
 require 'system/vendor/autoload.php';
-require 'system/htmly.php';
\ No newline at end of file
+require 'system/htmly.php';
diff --git a/system/htmly.php b/system/htmly.php
index 0cf8895..65d5193 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -238,9 +238,8 @@ get('/author/:name', function ($name) {
     $posts = get_profile_posts($name, $page, $perpage);
 
     $total = get_count('/'.$name.'/', 'dirname');
-    $username = 'config/users/' . $name . '.ini';
 
-    if ($total === 0 && !file_exists($username)) {
+    if ($total === 0) {
         not_found();
     }
 
@@ -2299,7 +2298,7 @@ get('/archive/:req', function ($req) {
 
     $posts = get_archive($req, $page, $perpage);
 
-    $total = get_count($req);
+    $total = get_count($req, 'basename');
 
     if (empty($posts) || $page < 1) {
         // a non-existing page
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 0648c55..48d0e49 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1063,8 +1063,6 @@ function get_author($name)
 {
     $names = get_author_name();
 
-    $username = 'config/users/' . $name . '.ini';
-
     $tmp = array();
 
     if (!empty($names)) {
@@ -1108,7 +1106,7 @@ function get_author($name)
         }
     }
 
-    if (!empty($tmp) || file_exists($username)) {
+    if (!empty($tmp)) {
         return $tmp;
     } else {
         return false;
@@ -1224,15 +1222,15 @@ function get_related($tag, $custom = null, $count = null)
 
 }
 
-// Return post count. Matching $var.
-function get_count($var)
+// Return post count. Matching $var and $str provided.
+function get_count($var, $str)
 {
     $posts = get_blog_posts();
 
     $tmp = array();
 
     foreach ($posts as $index => $v) {
-        $arr = explode('_', $v['basename']);
+        $arr = explode('_', $v[$str]);
         $url = $arr[0];
         if (stripos($url, "$var") !== false) {
             $tmp[] = $v;
@@ -2583,31 +2581,33 @@ function generate_rss($posts, $data = null)
         ->url($data->url)
         ->appendTo($feed);        
     }
-    foreach ($posts as $p) {
+    if ($posts) {
+        foreach ($posts as $p) {
 
-        if (!empty($rssLength)) {
-            if (strlen(strip_tags($p->body)) < config('rss.char')) {
-                $string = preg_replace('/\s\s+/', ' ', strip_tags($p->body));
-                $body = $string . '...';
+            if (!empty($rssLength)) {
+                if (strlen(strip_tags($p->body)) < config('rss.char')) {
+                    $string = preg_replace('/\s\s+/', ' ', strip_tags($p->body));
+                    $body = $string . '...';
+                } else {
+                    $string = preg_replace('/\s\s+/', ' ', strip_tags($p->body));
+                    $string = substr($string, 0, config('rss.char'));
+                    $string = substr($string, 0, strrpos($string, ' '));
+                    $body = $string . '...';
+                }
             } else {
-                $string = preg_replace('/\s\s+/', ' ', strip_tags($p->body));
-                $string = substr($string, 0, config('rss.char'));
-                $string = substr($string, 0, strrpos($string, ' '));
-                $body = $string . '...';
+                $body = $p->body;
             }
-        } else {
-            $body = $p->body;
-        }
 
-        $item = new Item();
-        $item
-            ->category(strip_tags($p->category));
-        $item
-            ->title($p->title)
-            ->pubDate($p->date)
-            ->description($body)
-            ->url($p->url)
-            ->appendTo($channel);
+            $item = new Item();
+            $item
+                ->category(strip_tags($p->category));
+            $item
+                ->title($p->title)
+                ->pubDate($p->date)
+                ->description($body)
+                ->url($p->url)
+                ->appendTo($channel);
+        }
     }
 
     return $feed;
@@ -3063,18 +3063,7 @@ function head_contents()
 {
     $output = '';
     $wmt_id = config('google.wmt.id');
-    static $_version = array();
-
-    $filename = "cache/installedVersion.json";
-    if (file_exists($filename)) {
-        $_version = json_decode(file_get_contents($filename), true);
-    }
-
-    if (isset($_version['tag_name'])) {
-        $version = 'HTMLy ' . $_version['tag_name'];
-    } else {
-        $version = 'HTMLy';
-    }
+    $version = 'HTMLy ' . constant('HTMLY_VERSION');
 
     $favicon = '<link rel="icon" type="image/x-icon" href="' . site_url() . 'favicon.ico" />';
     $charset = '<meta charset="utf-8" />';