From 60557abdb2a95cce10c1bc32a1923954be625fa9 Mon Sep 17 00:00:00 2001
From: wehao <30787186+wehaox@users.noreply.github.com>
Date: Tue, 22 Feb 2022 19:09:20 +0800
Subject: [PATCH] =?UTF-8?q?1.4.1=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.4.1更新
---
 404.php       | 90 +++++++++++++++++++++++++--------------------------
 functions.php |  3 ++
 index.php     |  4 +--
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/404.php b/404.php
index 6b332a5..e594ac8 100644
--- a/404.php
+++ b/404.php
@@ -9,54 +9,54 @@
          <span id="blog_name">
             <a id="site-name" href="<?php $this->options->siteUrl(); ?>"><?php $this->options->title() ?></a>
        </span>
-        <div id="menus">
-              <div id="search-button">
-                  <a class="site-page social-icon search">
-                  <i class="fas fa-search fa-fw"></i>
-                  <span> 搜索</span></a>
-                  </div>
-             <div id="toggle-menu"><a class="site-page"><i class="fas fa-bars fa-fw"></i></a></div>
-          <div class="menus_items">
-                     <div class="menus_item">
-                    <a class="site-page"
-                    <?php if($this->is('index')): ?> 
-                    <?php endif; ?> 
-                    href="<?php $this->options->siteUrl(); ?>">
-                <li class="fa-fw fas fa-home"></li><?php _e('首页'); ?></a>
+            <div id="menus">
+                  <div id="search-button">
+                      <a class="site-page social-icon search">
+                      <i class="fas fa-search fa-fw"></i>
+                      <span> 搜索</span></a>
                       </div>
-                    <?php $this->widget('Widget_Contents_Page_List')->to($pages); ?>
-                    <?php while($pages->next()): ?>
+                 <div id="toggle-menu"><a class="site-page"><i class="fas fa-bars fa-fw"></i></a></div>
+              <div class="menus_items">
                     <div class="menus_item">
-                    <a class="site-page" href="<?php $pages->permalink(); ?>" title="<?php $pages->title(); ?>">
-                        <?php if($this->is($pages->title == "友链")){
-                            echo"<i class='fa-fw fas fa-link'></i>";
-                        }
-                        elseif($this->is($pages->title == "关于")){
-                             echo"<li class='fa-fw fas fa-user'></li>";
-                        }
-                        elseif($this->is($pages->title=="留言")){
-                             echo"<i class='fa-fw fas fa-comment-dots'></i>";
-                        }
-                        elseif($this->is($pages->title=="归档")){
-                             echo"<i class='fa-fw fas fa-archive'></i>";
-                        }
-                        elseif($this->is($pages->title=="标签")){
-                             echo"<i class='fa-fw fas fa-tags'></i>";
-                        }
-                        elseif($this->is($pages->title=="分类")){
-                             echo"<i class='fa-fw fas fa-folder-open'></i>";
-                        }elseif($this->is($pages->title=="留言板")){
-                             echo"<i class='fa-fw fa fa-comment-dots'></i>";
-                        }else{
-                            echo"<i class='fa-fw fa fa-coffee'></i>";
-                        }
-                        ?>  
-                        <span><?php $pages->title(); ?></span>
-                        </a>
+                        <a class="site-page" href="<?php $this->options->siteUrl(); ?>">
+                            <li class="fa-fw fas fa-home"></li><?php _e('首页'); ?></a>
+                    </div>
+                    <?php if($this->options->EnableAutoHeaderLink === 'on') : ?>
+                        <?php $this->widget('Widget_Contents_Page_List')->to($pages); ?>
+                        <?php while($pages->next()): ?>
+                        <div class="menus_item">
+                            <a class="site-page" href="<?php $pages->permalink(); ?>" title="<?php $pages->title(); ?>">
+                            <?php if($this->is($pages->title == "友链")){
+                                echo"<i class='fa-fw fas fa-link'></i>";
+                            }
+                            elseif($this->is($pages->title == "关于")){
+                                 echo"<li class='fa-fw fas fa-user'></li>";
+                            }
+                            elseif($this->is($pages->title=="留言")){
+                                 echo"<i class='fa-fw fas fa-comment-dots'></i>";
+                            }
+                            elseif($this->is($pages->title=="归档")){
+                                 echo"<i class='fa-fw fas fa-archive'></i>";
+                            }
+                            elseif($this->is($pages->title=="标签")){
+                                 echo"<i class='fa-fw fas fa-tags'></i>";
+                            }
+                            elseif($this->is($pages->title=="分类")){
+                                 echo"<i class='fa-fw fas fa-folder-open'></i>";
+                            }elseif($this->is($pages->title=="留言板")){
+                                 echo"<i class='fa-fw fa fa-comment-dots'></i>";
+                            }else{
+                                echo"<i class='fa-fw fa fa-coffee'></i>";
+                            }
+                            ?>  
+                            <span><?php $pages->title(); ?></span>
+                            </a>
+                       </div>
                     <?php endwhile; ?>
-                </div>  
+                    <?php endif; ?>
+                    <?php $this->options->CustomHeaderLink() ?>
+                </div>
             </div>
-        </div>
     </nav>
 </header>
     <div id="error-wrap"><div class="error-content"><div class="error-img"><img src="https://i.loli.net/2020/05/19/aKOcLiyPl2JQdFD.png" alt="Page not found" class="entered"></div><div class="error-info"><h1 class="error_title">404</h1><div class="error_subtitle">頁面沒有找到</div></div></div></div></div>
@@ -85,4 +85,4 @@
 </div>
 <!--搜索  -->
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 426ef73..d130498 100644
--- a/functions.php
+++ b/functions.php
@@ -1317,6 +1317,9 @@ function get_post_view($archive)
 //总访问量
 function theAllViews(){
     $db = Typecho_Db::get();
+        if (!array_key_exists('views', $db->fetchRow($db->select()->from('table.contents')))) {
+        $db->query('ALTER TABLE `'.$db->getPrefix().'contents` ADD `views` INT(10) DEFAULT 0;');
+    }
     $row = $db->fetchAll($db->select('SUM(views)')->from('table.contents'));
     echo $row[0]["SUM(`views`)"];
 }
diff --git a/index.php b/index.php
index 91ade1d..19fcaa4 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * <a href="https://blog.wehaox.com/archives/blogtheme.html#cl-9">主题更新日志</a>
  * @package Typecho-Butterfly
  * @author b站:wehao-
- * @version 1.4.0
+ * @version 1.4.1
  * @link https://space.bilibili.com/34174433
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
@@ -116,7 +116,7 @@ function ver() {console.log(`
     #    # #    #   #     #   #      #   #  #      #        #    
     #####   ####    #     #   ###### #    # #      ######   #  
     
-                           1.4.0
+                           1.4.1
 ===================================================================
 `);}
 </script>
\ No newline at end of file