From 6129d5698a51f2d06257dca8c9b2e25775b30fc1 Mon Sep 17 00:00:00 2001
From: Seaton Jiang <seatonjiang@vtrois.com>
Date: Sat, 21 Aug 2021 10:35:11 +0800
Subject: [PATCH] refactor: code logic and parameter calling methods

---
 404.php                  | 16 +++-------------
 footer.php               | 24 +++++++++++-------------
 header.php               | 12 +++++-------
 inc/theme-article.php    |  9 ++-------
 inc/theme-core.php       | 16 ++++++++--------
 inc/theme-dogecloud.php  | 18 +++++++++---------
 inc/theme-options.php    | 15 +++++++--------
 inc/theme-setting.php    |  6 +++---
 inc/theme-volcengine.php | 20 ++++++++++----------
 index.php                | 16 +++-------------
 page.php                 |  8 ++------
 pages/page-content.php   | 10 ++++------
 pages/page-toolbar.php   |  4 ++--
 single.php               | 16 +++++-----------
 14 files changed, 74 insertions(+), 116 deletions(-)

diff --git a/404.php b/404.php
index 9ed9bc2..4c8fcd7 100644
--- a/404.php
+++ b/404.php
@@ -4,25 +4,15 @@
  * 404 模板
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 get_header(); ?>
-<div class="k-main<?php if (kratos_option('top_img_switch', true)) {
-                        echo ' banner';
-                    } else {
-                        echo ' color';
-                    }  ?>" style="background:#ffffff">
+<div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:#ffffff">
     <div class="container">
         <div class="row">
             <div class="col-12 page404">
-                <div class="thumbnail" style="background-image: url(<?php
-                                                                    if (!kratos_option('g_404')) {
-                                                                        $img = ASSET_PATH . '/assets/img/404.jpg';
-                                                                    } else {
-                                                                        $img = kratos_option('g_404', ASSET_PATH . '/assets/img/404.jpg');
-                                                                    }
-                                                                    echo $img; ?>">
+                <div class="thumbnail" style="background-image: url(<?php echo kratos_option('g_404', ASSET_PATH . '/assets/img/404.jpg'); ?>">
                     <div class="overlay"></div>
                 </div>
                 <div class="content text-center">
diff --git a/footer.php b/footer.php
index c748e77..f9321e4 100644
--- a/footer.php
+++ b/footer.php
@@ -4,23 +4,21 @@
  * 主题页脚
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 ?>
 <div class="k-footer">
     <div class="f-toolbox">
-        <div class="gotop <?php if (kratos_option('g_wechat', false, 'g_wechat_fieldset')) {
-                                echo 'gotop-haswechat';
-                            } ?>">
+        <div class="gotop <?php echo kratos_option('g_wechat_fieldset')['g_wechat'] ? 'gotop-haswechat' : ''; ?>">
             <div class="gotop-btn">
                 <span class="kicon i-up"></span>
             </div>
         </div>
-        <?php if (kratos_option('g_wechat', false, 'g_wechat_fieldset')) { ?>
+        <?php if (!empty(kratos_option('g_wechat_fieldset')['g_wechat'])) { ?>
             <div class="wechat">
                 <span class="kicon i-wechat"></span>
                 <div class="wechat-pic">
-                    <img src="<?php echo kratos_option('g_wechat_url', ASSET_PATH . '/assets/img/200.png', 'g_wechat_fieldset'); ?>">
+                    <img src="<?php echo kratos_option('g_wechat_fieldset')['g_wechat_img']; ?>">
                 </div>
             </div>
         <?php } ?>
@@ -36,23 +34,23 @@
             <div class="col-12 text-center">
                 <p class="social">
                     <?php
-                    $socials = array('s_sina_url', 's_bilibili_url', 's_douban_url', 's_coding_url', 's_gitee_url', 's_twitter_url', 's_telegram_url', 's_linkedin_url', 's_youtube_url', 's_github_url', 's_stackflow_url', 's_email_url');
-                    foreach ($socials as $value) {
-                        if (kratos_option($value, '', 's_social_fieldset')) {
-                            echo '<a target="_blank" rel="nofollow" href="' . kratos_option($value, '', 's_social_fieldset') . '"><i class="kicon i-' . str_replace(array("s_", "_url"), array('', ''), $value) . '"></i></a>';
+                    if (!empty(kratos_option('s_social_fieldset'))) {
+                        foreach (kratos_option('s_social_fieldset') as $key => $value) {
+                            if (kratos_option('s_social_fieldset')[$key]) {
+                                echo '<a target="_blank" rel="nofollow" href="' . kratos_option('s_social_fieldset')[$key] . '"><i class="kicon i-' . str_replace(array("s_", "_url"), array('', ''), $key) . '"></i></a>';
+                            }
                         }
                     }
                     ?>
                 </p>
                 <?php
-                $sitename = get_bloginfo('name');
-                echo '<p>' . kratos_option('s_copyright', 'COPYRIGHT © ' . date('Y') . ' ' . $sitename . '. ALL RIGHTS RESERVED.') . '</p>';
+                echo '<p>' . kratos_option('s_copyright', 'COPYRIGHT © ' . date('Y') . ' ' . get_bloginfo('name') . '. ALL RIGHTS RESERVED.') . '</p>';
                 echo '<p>THEME <a href="https://github.com/vtrois/kratos" target="_blank" rel="nofollow">KRATOS</a> MADE BY <a href="https://www.vtrois.com/" target="_blank" rel="nofollow">VTROIS</a></p>';
                 if (kratos_option('s_icp')) {
                     echo '<p><a href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' . kratos_option('s_icp') . '</a></p>';
                 }
                 if (kratos_option('s_gov')) {
-                    echo '<p><a href="' . kratos_option('s_gov_link', '#') . '" target="_blank" rel="nofollow" ><i class="police-ico"></i>' . kratos_option('s_gov') . '</a></p>';
+                    echo '<p><a href="' . kratos_option('s_gov_link') . '" target="_blank" rel="nofollow" ><i class="police-ico"></i>' . kratos_option('s_gov') . '</a></p>';
                 }
                 if (kratos_option('seo_statistical')) {
                     echo kratos_option('seo_statistical');
diff --git a/header.php b/header.php
index 34afd19..4ecebe8 100644
--- a/header.php
+++ b/header.php
@@ -4,7 +4,7 @@
  * 主题页眉
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 ?>
 <!DOCTYPE html>
@@ -21,17 +21,15 @@
     <meta name="theme-color" content="<?php echo kratos_option('g_chrome', '#282a2c'); ?>">
     <meta itemprop="image" content="<?php echo share_thumbnail_url(); ?>" />
     <?php if (kratos_option('g_icon')) echo '<link rel="shortcut icon" href="' . kratos_option("g_icon") . '">' ?>
-    <?php wp_head();
-    wp_print_scripts('jquery');
-    mourning(); ?>
+    <?php wp_head(); ?>
+    <?php wp_print_scripts('jquery'); ?>
+    <?php mourning(); ?>
 </head>
 <?php flush(); ?>
 
 <body>
     <div class="k-header">
-        <nav class="k-nav navbar navbar-expand-lg navbar-light fixed-top" <?php if (kratos_option('top_img_switch', true) == false) {
-                                                                                echo 'style="background:' . kratos_option('top_color', '#24292e') . '"';
-                                                                            } ?>>
+        <nav class="k-nav navbar navbar-expand-lg navbar-light fixed-top" <?php echo kratos_option('top_img_switch', true) ? '' : 'style="background:' . kratos_option('top_color', '#24292e') . '"'; ?>>
             <div class="container">
                 <a class="navbar-brand" href="<?php echo get_option('home'); ?>">
                     <?php
diff --git a/inc/theme-article.php b/inc/theme-article.php
index 9029786..f84a519 100644
--- a/inc/theme-article.php
+++ b/inc/theme-article.php
@@ -4,7 +4,7 @@
  * 文章相关函数
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 // 文章链接添加 target 和 rel
@@ -134,12 +134,7 @@ function post_thumbnail()
         if (!empty($img_val)) {
             echo '<img src="' . $img_val . '" />';
         } else {
-            if (!kratos_option('g_postthumbnail')) {
-                $img = ASSET_PATH . '/assets/img/default.jpg';
-            } else {
-                $img = kratos_option('g_postthumbnail', ASSET_PATH . '/assets/img/default.jpg');
-            }
-            echo '<img src="' . $img . '" />';
+            echo '<img src="' . kratos_option('g_postthumbnail', ASSET_PATH . '/assets/img/default.jpg') . '" />';
         }
     }
 }
diff --git a/inc/theme-core.php b/inc/theme-core.php
index 8524833..933c62c 100644
--- a/inc/theme-core.php
+++ b/inc/theme-core.php
@@ -4,7 +4,7 @@
  * 核心函数
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 // CDN 资源地址
@@ -89,8 +89,8 @@ function theme_autoload()
         $data = array(
             'site' => home_url(),
             'directory' => ASSET_PATH,
-            'alipay' => kratos_option('g_donate_alipay', ASSET_PATH . '/assets/img/200.png', 'g_donate_fieldset'),
-            'wechat' => kratos_option('g_donate_wechat', ASSET_PATH . '/assets/img/200.png', 'g_donate_fieldset'),
+            'alipay' => kratos_option('g_donate_fieldset')['g_donate_alipay'],
+            'wechat' => kratos_option('g_donate_fieldset')['g_donate_wechat'],
             'repeat' => __('您已经赞过了', 'kratos'),
             'thanks' => __('感谢您的支持', 'kratos'),
             'donate' => __('打赏作者', 'kratos'),
@@ -182,8 +182,8 @@ add_filter('style_loader_src', function ($href) {
 // 替换国内 Gravatar 源
 function get_https_avatar($avatar)
 {
-    if (kratos_option('g_gravatar', false)) {
-        $cdn = "gravatar.loli.net";
+    if (kratos_option('g_gravatar', true)) {
+        $cdn = "dn-qiniu-avatar.qbox.me";
     } else {
         $cdn = "cn.gravatar.com";
     }
@@ -232,11 +232,11 @@ function custom_upload_filter($file)
 
     $ext = '.' . $info['extension'];
 
-    $prdfix = kratos_option('g_renameother_prdfix', getdomain(home_url()), 'g_renameother_fieldset') . '-';
+    $prdfix = kratos_option('g_renameother_fieldset')['g_renameother_prdfix'] . '-';
 
     $img_mimes = array('jpg', 'JPG', 'jpeg', 'JPEG', 'gif', 'GIF', 'png', 'PNG', 'bmp', 'BMP', 'webp', 'WEBP', 'svg', 'SVG');
 
-    $str = kratos_option('g_renameother_mime', 'tar|zip|gz|gzip|rar|7z', 'g_renameother_fieldset');
+    $str = kratos_option('g_renameother_fieldset')['g_renameother_mime'];
     $arr = explode("|", $str);
     $arr = array_filter($arr);
 
@@ -255,7 +255,7 @@ function custom_upload_filter($file)
         }
     }
 
-    if (kratos_option('g_renameother', false, 'g_renameother_fieldset')) {
+    if (kratos_option('g_renameother_fieldset')['g_renameother']) {
         foreach ($compressed_mimes as $compressed_mime) {
             if ($info['extension'] == $compressed_mime) {
                 $file['name'] = $prdfix . $file['name'];
diff --git a/inc/theme-dogecloud.php b/inc/theme-dogecloud.php
index b87aa0b..d1f2a1a 100644
--- a/inc/theme-dogecloud.php
+++ b/inc/theme-dogecloud.php
@@ -4,19 +4,19 @@
  * dogecloud 对象存储
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
-if (kratos_option('g_cos', false, 'g_cos_fieldset')) {
+if (!empty(kratos_option('g_cos_fieldset')['g_cos'])) {
     function dogcloud_upload($object, $file, $mime)
     {
         if (!@file_exists($file)) {
             return false;
         }
         if (@file_exists($file)) {
-            $accessKey = kratos_option('g_cos_accesskey', '', 'g_cos_fieldset');
-            $secretKey = kratos_option('g_cos_secretkey', '', 'g_cos_fieldset');
-            $bucket = kratos_option('g_cos_bucketname', '', 'g_cos_fieldset');
+            $accessKey = kratos_option('g_cos_fieldset')['g_cos_accesskey'];
+            $secretKey = kratos_option('g_cos_fieldset')['g_cos_secretkey'];
+            $bucket = kratos_option('g_cos_fieldset')['g_cos_bucketname'];
 
             $filesize = fileSize($file);
             $file = fopen($file, 'rb');
@@ -104,9 +104,9 @@ if (kratos_option('g_cos', false, 'g_cos_fieldset')) {
     // 删除文件
     function dogecloud_delete_remote_file($file)
     {
-        $accessKey = kratos_option('g_cos_accesskey', '', 'g_cos_fieldset');
-        $secretKey = kratos_option('g_cos_secretkey', '', 'g_cos_fieldset');
-        $bucket = kratos_option('g_cos_bucketname', '', 'g_cos_fieldset');
+        $accessKey = kratos_option('g_cos_fieldset')['g_cos_accesskey'];
+        $secretKey = kratos_option('g_cos_fieldset')['g_cos_secretkey'];
+        $bucket = kratos_option('g_cos_fieldset')['g_cos_bucketname'];
 
         $file = str_replace("\\", '/', $file);
         $file = str_replace(get_home_path(), '', $file);
@@ -131,7 +131,7 @@ if (kratos_option('g_cos', false, 'g_cos_fieldset')) {
     function custom_upload_dir($uploads)
     {
         $upload_path = '';
-        $upload_url_path = kratos_option('g_cos_url', '', 'g_cos_fieldset');
+        $upload_url_path = kratos_option('g_cos_fieldset')['g_cos_url'];
 
         if (empty($upload_path) || 'wp-content/uploads' == $upload_path) {
             $uploads['basedir'] = WP_CONTENT_DIR . '/uploads';
diff --git a/inc/theme-options.php b/inc/theme-options.php
index ce2a079..1de1f79 100644
--- a/inc/theme-options.php
+++ b/inc/theme-options.php
@@ -12,17 +12,16 @@ defined('ABSPATH') || exit;
 $prefix = 'kratos_options';
 
 if (!function_exists('kratos_option')) {
-    function kratos_option($option = '', $default = null, $fieldset = '')
+    function kratos_option($name, $default = false)
     {
+
         $options = get_option('kratos_options');
 
-        if (!empty($fieldset)) {
-            $results = $options[$fieldset][$option];
-        } else {
-            $results = $options[$option];
+        if (isset($options[$name])) {
+            return $options[$name];
         }
 
-        return (isset($results)) ? $results : $default;
+        return $default;
     }
 }
 
@@ -235,7 +234,7 @@ CSF::createSection($prefix, array(
                     'text_off' => __('关闭', 'kratos'),
                 ),
                 array(
-                    'id' => 'g_wechat_url',
+                    'id' => 'g_wechat_img',
                     'type' => 'upload',
                     'title' =>  __('二维码图片', 'kratos'),
                     'library' => 'image',
@@ -245,7 +244,7 @@ CSF::createSection($prefix, array(
             ),
             'default' => array(
                 'g_wechat' => false,
-                'g_wechat_url' => get_template_directory_uri() . '/assets/img/200.png',
+                'g_wechat_img' => get_template_directory_uri() . '/assets/img/200.png',
             ),
         ),
     ),
diff --git a/inc/theme-setting.php b/inc/theme-setting.php
index 4d2d125..f10f8ad 100644
--- a/inc/theme-setting.php
+++ b/inc/theme-setting.php
@@ -4,7 +4,7 @@
  * 站点相关函数
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 // 标题配置
@@ -86,8 +86,8 @@ add_filter('robots_txt', function ($output, $public) {
     if ('0' == $public) {
         return "User-agent: *\nDisallow: /\n";
     } else {
-        if (!empty(kratos_option('seo_robots', getrobots(), 'seo_robots_fieldset'))) {
-            $output = esc_attr(strip_tags(kratos_option('seo_robots', getrobots(), 'seo_robots_fieldset')));
+        if (!empty(kratos_option('seo_robots_fieldset')['seo_robots'])) {
+            $output = esc_attr(strip_tags(kratos_option('seo_robots_fieldset')['seo_robots']));
         }
         return $output;
     }
diff --git a/inc/theme-volcengine.php b/inc/theme-volcengine.php
index 97949cb..cf3f112 100644
--- a/inc/theme-volcengine.php
+++ b/inc/theme-volcengine.php
@@ -4,19 +4,19 @@
  * ImageX 图片服务
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 require_once 'volcengine-imagex/vendor/autoload.php';
 
 use Volc\Service\ImageX;
 
-if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
+if (!empty(kratos_option('g_imgx_fieldset')['g_imgx'])) {
 
     function imagex_get_client()
     {
-        $imagex_client = ImageX::getInstance($region = kratos_option('g_imgx_region', '', 'g_imgx_fieldset'));
-        $imagex_client->setAccessKey(kratos_option('g_imgx_accesskey', '', 'g_imgx_fieldset'));
-        $imagex_client->setSecretKey(kratos_option('g_imgx_secretkey', '', 'g_imgx_fieldset'));
+        $imagex_client = ImageX::getInstance($region = kratos_option('g_imgx_fieldset')['g_imgx_region']);
+        $imagex_client->setAccessKey(kratos_option('g_imgx_fieldset')['g_imgx_accesskey']);
+        $imagex_client->setSecretKey(kratos_option('g_imgx_fieldset')['g_imgx_secretkey']);
 
         return $imagex_client;
     }
@@ -29,7 +29,7 @@ if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
         if (@file_exists($file)) {
             $client = imagex_get_client();
             $params = array();
-            $params["ServiceId"] = kratos_option('g_imgx_serviceid', '', 'g_imgx_fieldset');
+            $params["ServiceId"] = kratos_option('g_imgx_fieldset')['g_imgx_serviceid'];
             $params['UploadNum'] = 1;
             $params['StoreKeys'] = array($object);
             $response = $client->uploadImages($params, array($file));
@@ -96,7 +96,7 @@ if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
         $file = str_replace(get_home_path(), '', $file);
         $del_file_path = str_replace("wp-content/uploads/", '', $file);
 
-        $client->deleteImages(kratos_option('g_imgx_serviceid', '', 'g_imgx_fieldset'), array($del_file_path));
+        $client->deleteImages(kratos_option('g_imgx_fieldset')['g_imgx_serviceid'], array($del_file_path));
 
         return $file;
     }
@@ -106,7 +106,7 @@ if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
     function custom_upload_dir($uploads)
     {
         $upload_path = '';
-        $upload_url_path = kratos_option('g_imgx_url', '', 'g_imgx_fieldset');
+        $upload_url_path = kratos_option('g_imgx_fieldset')['g_imgx_url'];
 
         if (empty($upload_path) || 'wp-content/uploads' == $upload_path) {
             $uploads['basedir'] = WP_CONTENT_DIR . '/uploads';
@@ -136,7 +136,7 @@ if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
         preg_match_all('/<img.*?(?: |\\t|\\r|\\n)?src=[\'"]?(.+?)[\'"]?(?:(?: |\\t|\\r|\\n)+.*?)?>/sim', $content, $images);
         if (!empty($images) && isset($images[1])) {
             foreach ($images[1] as $item) {
-                $content = str_replace($item, $item . kratos_option('g_imgx_tmp', '', 'g_imgx_fieldset'), $content);
+                $content = str_replace($item, $item . kratos_option('g_imgx_fieldset')['g_imgx_tmp'], $content);
             }
         }
         return $content;
@@ -149,7 +149,7 @@ if (kratos_option('g_imgx', false, 'g_imgx_fieldset')) {
             preg_match_all('/<img.*?(?: |\\t|\\r|\\n)?src=[\'"]?(.+?)[\'"]?(?:(?: |\\t|\\r|\\n)+.*?)?>/sim', $html, $images);
             if (!empty($images) && isset($images[1])) {
                 foreach ($images[1] as $item) {
-                    $html = str_replace($item, $item . kratos_option('g_imgx_tmp', '', 'g_imgx_fieldset'), $html);
+                    $html = str_replace($item, $item . kratos_option('g_imgx_fieldset')['g_imgx_tmp'], $html);
                 }
             }
         }
diff --git a/index.php b/index.php
index 2cce82f..f2fa403 100644
--- a/index.php
+++ b/index.php
@@ -4,14 +4,10 @@
  * 首页模板
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 get_header(); ?>
-<div class="k-main<?php if (kratos_option('top_img_switch', true)) {
-                        echo ' banner';
-                    } else {
-                        echo ' color';
-                    }  ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
+<div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
     <div class="container">
         <div class="row">
             <div class="col-lg-8 board">
@@ -32,13 +28,7 @@ get_header(); ?>
                 } else { ?>
                     <div class="article-panel">
                         <div class="nothing">
-                            <img src="<?php
-                                        if (!kratos_option('g_nothing')) {
-                                            $img = ASSET_PATH . '/assets/img/nothing.svg';
-                                        } else {
-                                            $img = kratos_option('g_nothing', ASSET_PATH . '/assets/img/nothing.svg');
-                                        }
-                                        echo $img; ?>">
+                            <img src="<?php echo kratos_option('g_nothing', ASSET_PATH . '/assets/img/nothing.svg'); ?>">
                             <div class="sorry"><?php _e('很抱歉，没有找到任何内容', 'kratos'); ?></div>
                         </div>
                     </div>
diff --git a/page.php b/page.php
index b59970e..7b6074f 100644
--- a/page.php
+++ b/page.php
@@ -4,15 +4,11 @@
  * 页面模板
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 get_header(); ?>
-<div class="k-main<?php if (kratos_option('top_img_switch', true)) {
-                        echo ' banner';
-                    } else {
-                        echo ' color';
-                    }  ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
+<div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
     <div class="container">
         <div class="row">
             <div class="col-lg-8 details">
diff --git a/pages/page-content.php b/pages/page-content.php
index 777cfcc..69750a9 100644
--- a/pages/page-content.php
+++ b/pages/page-content.php
@@ -4,13 +4,13 @@
  * 文章列表
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 ?>
 <div class="article-panel">
     <span class="a-card d-none d-md-block d-lg-block">
-        <?php $article_comment = kratos_option('g_article_comment', '20', 'g_article_fieldset');
-        $article_love = kratos_option('g_article_love', '200', 'g_article_fieldset');
+        <?php $article_comment = kratos_option('g_article_fieldset')['g_article_comment'] ?? '20';
+        $article_love = kratos_option('g_article_fieldset')['g_article_love'] ?? '200';
         if (is_sticky()) { ?>
             <i class="kicon i-card-top"></i>
         <?php } elseif (findSinglecomments($post->ID) >= $article_comment || get_post_meta($post->ID, 'love', true) >= $article_love) { ?>
@@ -24,9 +24,7 @@
             </a>
         </div>
     <?php } ?>
-    <div class="a-post <?php if (!kratos_option('g_thumbnail', true)) {
-                            echo 'a-none';
-                        } ?>">
+    <div class="a-post <?php echo kratos_option('g_thumbnail', true) ?? 'a-none'; ?>">
         <div class="header">
             <?php
             $category = get_the_category();
diff --git a/pages/page-toolbar.php b/pages/page-toolbar.php
index bbc5de1..895f6f0 100644
--- a/pages/page-toolbar.php
+++ b/pages/page-toolbar.php
@@ -4,7 +4,7 @@
  * 文章工具栏
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 ?>
 <div class="toolbar clearfix">
@@ -14,7 +14,7 @@
 		<p class="motto mb-0"><?php echo $description = !empty(get_the_author_meta('description')) ? get_the_author_meta('description') : __('这个人很懒，什么都没留下', 'kratos'); ?></p>
 	</div>
 	<div class="share float-md-right text-center">
-		<?php if (kratos_option('g_donate', false, 'g_donate_fieldset')) { ?>
+		<?php if (kratos_option('g_donate_fieldset')['g_donate']) { ?>
 			<a href="javascript:;" id="donate" class="btn btn-donate mr-3" role="button"><i class="kicon i-donate"></i> <?php _e('打赏', 'kratos'); ?></a>
 		<?php } ?>
 		<a href="javascript:;" id="thumbs" data-action="love" data-id="<?php the_ID(); ?>" role="button" class="btn btn-thumbs <?php if (isset($_COOKIE['love_' . $post->ID])) echo 'done'; ?>"><i class="kicon i-like"></i><span class="ml-1"><?php _e('点赞', 'kratos'); ?></span></a>
diff --git a/single.php b/single.php
index 92cf335..5f585f5 100644
--- a/single.php
+++ b/single.php
@@ -4,7 +4,7 @@
  * 文章内容
  * @author Seaton Jiang <seatonjiang@vtrois.com>
  * @license GPL-3.0 License
- * @version 2021.08.20
+ * @version 2021.08.21
  */
 
 get_header();
@@ -12,16 +12,11 @@ $col_array = array(
     'one_side' => 'col-lg-12',
     'two_side' => 'col-lg-8'
 );
-$select_col = $col_array[kratos_option('g_article_widgets', 'two_side')];
 ?>
-<div class="k-main<?php if (kratos_option('top_img_switch', true)) {
-                        echo ' banner';
-                    } else {
-                        echo ' color';
-                    } ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
+<div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
     <div class="container">
         <div class="row">
-            <div class="<?php echo $select_col ?> details">
+            <div class="<?php echo $col_array[kratos_option('g_article_widgets', 'two_side')] ?> details">
                 <?php if (have_posts()) : the_post();
                     update_post_caches($posts); ?>
                     <div class="article">
@@ -118,7 +113,7 @@ $select_col = $col_array[kratos_option('g_article_widgets', 'two_side')];
                             }
                             ?>
                         </div>
-                        <?php if (kratos_option('g_cc_switch', false, 'g_cc_fieldset')) {
+                        <?php if (kratos_option('g_cc_fieldset')['g_cc_switch']) {
                             $cc_array = array(
                                 'one' => __('知识共享署名 4.0 国际许可协议', 'kratos'),
                                 'two' => __('知识共享署名-非商业性使用 4.0 国际许可协议', 'kratos'),
@@ -127,9 +122,8 @@ $select_col = $col_array[kratos_option('g_article_widgets', 'two_side')];
                                 'five' => __('知识共享署名-相同方式共享 4.0 国际许可协议', 'kratos'),
                                 'six' => __('知识共享署名-非商业性使用-相同方式共享 4.0 国际许可协议', 'kratos'),
                             );
-                            $select_cc = $cc_array[kratos_option('g_cc', 'one', 'g_cc_fieldset')];
                             echo '<div class="copyright"><span class="text-center">';
-                            printf(__('本作品采用 %s 进行许可', 'kratos'), $select_cc);
+                            printf(__('本作品采用 %s 进行许可', 'kratos'), $cc_array[kratos_option('g_cc_fieldset')['g_cc']]);
                             echo '</span></div>';
                         } ?>
                         <div class="footer clearfix">