From 8a7f6e5baa8d01c6a089a4fe19fb5217cb23e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=AA=E5=AD=90?= <jkjoy@live.cn>
Date: Sat, 22 Mar 2025 20:47:48 +0800
Subject: [PATCH] 0.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除了第三方评论的设置
---
 functions.php  | 16 +++++++---------
 page-goods.php |  3 +++
 page.php       |  2 --
 post.php       |  9 +++------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/functions.php b/functions.php
index 79042ce..fbd9a0e 100644
--- a/functions.php
+++ b/functions.php
@@ -12,15 +12,15 @@ function themeConfig($form) {
     $form->addInput($travel);
     $memos = new Typecho_Widget_Helper_Form_Element_Text('memos', NULL, NULL, _t('说说分类 Mid'), _t('填写分类的mid'), _t('指定分类ID，用于说说分类展示'));
     $form->addInput($memos);    
-    $instagramurl = new Typecho_Widget_Helper_Form_Element_Text('instagramurl', NULL, 'https://Instagram.com/', _t('Instagram'), _t('会在个人信息显示'));
+    $instagramurl = new Typecho_Widget_Helper_Form_Element_Text('instagramurl', NULL, NULL, _t('Instagram'), _t('会在个人信息显示'));
     $form->addInput($instagramurl);
     $telegramurl = new Typecho_Widget_Helper_Form_Element_Text('telegramurl', NULL, 'https://t.me/', _t('电报'), _t('会在个人信息显示'));
     $form->addInput($telegramurl);
     $githuburl = new Typecho_Widget_Helper_Form_Element_Text('githuburl', NULL, 'https://github.com/', _t('github'), _t('会在个人信息显示'));
     $form->addInput($githuburl);
-    $twitterurl = new Typecho_Widget_Helper_Form_Element_Text('twitterurl', NULL, 'https://x.com/', _t('twitter'), _t('会在个人信息显示'));
+    $twitterurl = new Typecho_Widget_Helper_Form_Element_Text('twitterurl', NULL, NULL, _t('twitter'), _t('会在个人信息显示'));
     $form->addInput($twitterurl);
-    $mastodonurl = new Typecho_Widget_Helper_Form_Element_Text('mastodonurl', NULL,'https://jiong.us/', _t('mastodon'), _t('会在个人信息显示'));
+    $mastodonurl = new Typecho_Widget_Helper_Form_Element_Text('mastodonurl', NULL, NULL, _t('mastodon'), _t('会在个人信息显示'));
     $form->addInput($mastodonurl);
     $showProfile = new Typecho_Widget_Helper_Form_Element_Radio('showProfile',
     array('0'=> _t('否'), '1'=> _t('是')),
@@ -46,17 +46,15 @@ function themeConfig($form) {
     array('0'=> _t('加载更多'), '1'=> _t('页码模式')),
     '0', _t('加载文章列表方式'), _t('加载更多将在文章列表底部显示加载更多按钮'));
     $form->addInput($loadmore);
-    $sitemapurl = new Typecho_Widget_Helper_Form_Element_Text('sitemapurl', NULL, NULL, _t('sitemap'), _t('会在页脚显示'));
+    $sitemapurl = new Typecho_Widget_Helper_Form_Element_Text('sitemapurl', NULL, NULL, _t('sitemap'), _t('网站地图链接'));
     $form->addInput($sitemapurl);
-    $cnavatar = new Typecho_Widget_Helper_Form_Element_Text('cnavatar', NULL, 'https://cravatar.cn/avatar/', _t('Gravatar镜像'), _t('默认https://cravatar.cn/avatar/,建议保持默认'));
+    $cnavatar = new Typecho_Widget_Helper_Form_Element_Text('cnavatar', NULL, NULL , _t('Gravatar镜像'), _t('默认https://cravatar.cn/avatar/'));
     $form->addInput($cnavatar);
     $midimg = new Typecho_Widget_Helper_Form_Element_Text('midimg', NULL, '/img/', _t('填写分类图片路径,以"/"结尾'), _t('默认使用网站根目录下的img文件夹,也可以填写绝对或者CDN地址,自动匹配目录下以分类ID为文件名的mid.jpg格式的图片'));
     $form->addInput($midimg);
-    $donate = new Typecho_Widget_Helper_Form_Element_Text('donate', NULL, 'https://blogcdn.loliko.cn/donate/wx.png', _t('赞赏二维码'), _t('不填写则不显示'));
+    $donate = new Typecho_Widget_Helper_Form_Element_Text('donate', NULL, NULL, _t('赞赏二维码'), _t('不填写则不显示'));
     $form->addInput($donate);
-    $twikoo = new Typecho_Widget_Helper_Form_Element_Textarea('twikoo', NULL, NULL, _t('引用第三方评论'), _t('不填写则不显示'));
-    $form->addInput($twikoo);
-    $addhead = new Typecho_Widget_Helper_Form_Element_Textarea('addhead', NULL, NULL, _t('添加head'), _t('支持HTML'));
+    $addhead = new Typecho_Widget_Helper_Form_Element_Textarea('addhead', NULL, NULL, _t('Head内代码用于网站验证等'), _t('支持HTML'));
     $form->addInput($addhead);
     $tongji = new Typecho_Widget_Helper_Form_Element_Textarea('tongji', NULL, NULL, _t('统计代码'), _t('支持HTML'));
     $form->addInput($tongji);
diff --git a/page-goods.php b/page-goods.php
index a99ddea..298d48b 100644
--- a/page-goods.php
+++ b/page-goods.php
@@ -40,6 +40,9 @@ $this->need('./module/header.php');
         }
         ?>
     </div>
+    <?php if ($this->allow('comment')): ?>
+       <?php $this->need('./module/comments.php'); ?>
+    <?php endif; ?>
 </div>
 
 <style>
diff --git a/page.php b/page.php
index 01d35b5..d08b87d 100644
--- a/page.php
+++ b/page.php
@@ -12,8 +12,6 @@
     <?php if ($this->allow('comment')): ?>
        <?php $this->need('./module/comments.php'); ?>
    <?php endif; ?>
-   <!-- 可以使用第三方评论-->
-<?php $this->options->twikoo(); ?> 
 </article>
 </section>
 <?php $this->need('module/footer.php'); ?>
diff --git a/post.php b/post.php
index 400ea9b..bc9d629 100644
--- a/post.php
+++ b/post.php
@@ -125,12 +125,9 @@
 <?php if ($this->options->showrelated): ?>
     <?php $this->need('module/related.php'); ?>
 <?php endif; ?>
-    <!-- 如果设置了第三方评论系统则使用第三方评论 -->
-    <?php if($this->options->twikoo): ?> 
-        <?php $this->options->twikoo(); ?> 
-    <?php else: ?>
-        <?php $this->need('./module/comments.php'); ?>
-    <?php endif; ?>
+<?php if ($this->allow('comment')): ?>
+    <?php $this->need('./module/comments.php'); ?>
+<?php endif; ?>
 <!--翻页-->
     <nav class="navigation post-navigation is-active">
         <div class="nav-links">