From 59a16c642d47e64ddb7753851d6701a50f53016c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E8=90=BD?= <sp91@qq.com>
Date: Mon, 27 Jan 2020 12:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BD=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/options-config.php                  | 48 ++++++++++++-----
 framework/plugin-options.php                  | 16 +++---
 functions/advanced.php                        |  2 +-
 functions/optimization.php                    | 16 +++---
 functions/security.php                        |  6 +--
 functions/seo.php                             | 51 +++++++++++++++++++
 .../functions => functions}/sitemap-xml.php   | 22 ++++----
 modules/base/functions/seo-extra.php          | 45 ----------------
 8 files changed, 116 insertions(+), 90 deletions(-)
 rename {modules/base/functions => functions}/sitemap-xml.php (85%)

diff --git a/framework/options-config.php b/framework/options-config.php
index 7530ba6..2770dc9 100644
--- a/framework/options-config.php
+++ b/framework/options-config.php
@@ -128,24 +128,44 @@ $gdk_options = [
 			'std'   => '|'
 		],
 		[
-			'name'  => '自动内链',
-			'desc'  => '启用',
-			'id'    => 'git_autolink_b',
-			'type'  => 'checkbox'
-		],
-		[
-			'name'  => '关键词出现数目',
-			'desc'  => '文章中少于这个数字的关键词将不自动内链，默认是1，即全部链接',
-			'id'    => 'git_autolink_1',
-			'type'  => 'number',
-			'std'   => 1
+			'name'  => '文章自动内链',
+			'desc'  => '该功能会将文章中与标签匹配的文字自动添加标签链接,如果是纯文字的内容建议打开,默认禁用',
+			'id'    => 'gdk_tag_link',
+			'type'  => 'radio',
+			'options' => [
+				'0' => '禁用',
+				'1' => '开启'
+			],
+			'std'   => '0'
 		],
 		[
 			'name'  => '关键词链接次数',
-			'desc'  => '文章中最多链接的次数，默认是6',
-			'id'    => 'git_autolink_2',
+			'desc'  => '文章中最多链接的次数，默认是5',
+			'id'    => 'gdk_tag_num',
 			'type'  => 'number',
-			'std'   => 6
+			'std'   => 5
+		],
+		[
+			'name'  => 'Robots.txt 优化',
+			'desc'  => '该功能会自动生成一个虚拟Robots.txt文件,和真实文件效果一样的,默认开启',
+			'id'    => 'gdk_robots',
+			'type'  => 'radio',
+			'options' => [
+				'0' => '禁用',
+				'1' => '开启'
+			],
+			'std'   => '1'
+		],
+		[
+			'name'  => '网站地图 sitemap_xml',
+			'desc'  => '该功能会自动生成网站地图链接:域名/sitemap_xml,开启后建议更新固定链接一次,默认开启',
+			'id'    => 'gdk_sitemap_xml',
+			'type'  => 'radio',
+			'options' => [
+				'0' => '禁用',
+				'1' => '开启'
+			],
+			'std'   => '1'
 		],
 		[
 			'name'  => '图片自动添加alt以及title',
diff --git a/framework/plugin-options.php b/framework/plugin-options.php
index 1b369cf..2bb1e2c 100644
--- a/framework/plugin-options.php
+++ b/framework/plugin-options.php
@@ -30,7 +30,7 @@ function gdk_update_options() {
 gdk_update_options();
 
 //获取设置选项
-function gdk_get_option($id, $returnDefault = false) {
+function gdk_option($id, $returnDefault = false) {
 	global $gdk_default_options, $gdk_current_options;
 	return stripslashes( $returnDefault ? $gdk_default_options[$id] : $gdk_current_options[$id] );
 }
@@ -92,7 +92,7 @@ switch ( $type ) {
 	case 'text':
 ?>
 		<label>
-		<input name="<?php echo $id; ?>" class="regular-text" id="<?php echo $id; ?>" type="text" value="<?php echo esc_attr(gdk_get_option( $id )) ?>" />
+		<input name="<?php echo $id; ?>" class="regular-text" id="<?php echo $id; ?>" type="text" value="<?php echo esc_attr(gdk_option( $id )) ?>" />
 		</label>
 		<p class="description"><?php echo $option['desc']; ?></p>
 <?php
@@ -100,7 +100,7 @@ switch ( $type ) {
 	case 'number':
 ?>
 		<label>
-		<input name="<?php echo $id; ?>" class="small-text" id="<?php echo $id; ?>" type="number" value="<?php echo esc_attr(gdk_get_option( $id )) ?>" />
+		<input name="<?php echo $id; ?>" class="small-text" id="<?php echo $id; ?>" type="number" value="<?php echo esc_attr(gdk_option( $id )) ?>" />
 		<span class="description"><?php echo $option['desc']; ?></span>
 		</label>
 <?php
@@ -108,7 +108,7 @@ switch ( $type ) {
 	case 'textarea':
 ?>
 		<p><label for="<?php echo $id; ?>"><?php echo $option['desc']; ?></label></p>
-		<p><textarea name="<?php echo $id; ?>" id="<?php echo $id; ?>" rows="10" cols="50" class="large-text code"><?php echo esc_textarea(gdk_get_option( $id )) ?></textarea></p>
+		<p><textarea name="<?php echo $id; ?>" id="<?php echo $id; ?>" rows="10" cols="50" class="large-text code"><?php echo esc_textarea(gdk_option( $id )) ?></textarea></p>
 <?php
 	break;
 	case 'radio':
@@ -116,7 +116,7 @@ switch ( $type ) {
 		<fieldset>
 		<?php foreach ($option['options'] as $val => $name) : ?>
 		<label>
-			<input type="radio" name="<?php echo $id; ?>" id="<?php echo $id . '_' . $val; ?>" value="<?php echo $val; ?>" <?php checked( gdk_get_option( $id ), $val); ?>>
+			<input type="radio" name="<?php echo $id; ?>" id="<?php echo $id . '_' . $val; ?>" value="<?php echo $val; ?>" <?php checked( gdk_option( $id ), $val); ?>>
 			<?php echo $name; ?>
 		</label>
 		<?php endforeach; ?>
@@ -127,7 +127,7 @@ switch ( $type ) {
 	case 'checkbox':
 ?>
 		<label>
-			<input type='checkbox' name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="1" <?php echo checked(gdk_get_option($id)); ?> />
+			<input type='checkbox' name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="1" <?php echo checked(gdk_option($id)); ?> />
 			<span><?php echo $option['desc']; ?></span>
 		</label>
 <?php
@@ -135,7 +135,7 @@ switch ( $type ) {
 	case 'checkboxs':
 ?>
 		<fieldset>
-		<?php $checkboxValues = gdk_get_option( $id );
+		<?php $checkboxValues = gdk_option( $id );
 		if ( !is_array($checkboxValues) ) $checkboxValues = [];
 		foreach ( $option['options'] as $id => $name ) : ?>
 		<label>
@@ -150,7 +150,7 @@ switch ( $type ) {
 	default:
 ?>
 		<label>
-		<input name="<?php echo $id; ?>" class="regular-text" id="<?php echo $id; ?>" type="<?php echo $type; ?>" value="<?php echo esc_attr(gdk_get_option( $id )) ?>" />
+		<input name="<?php echo $id; ?>" class="regular-text" id="<?php echo $id; ?>" type="<?php echo $type; ?>" value="<?php echo esc_attr(gdk_option( $id )) ?>" />
 		</label>
 		<p class="description"><?php echo $option['desc']; ?></p>
 <?php
diff --git a/functions/advanced.php b/functions/advanced.php
index 26675fd..75c9cd8 100644
--- a/functions/advanced.php
+++ b/functions/advanced.php
@@ -2,7 +2,7 @@
 
 //头像解决方案
 function gdk_switch_get_avatar( $avatar ) {
-	switch (gdk_get_option('gdk_switch_get_avatar')) {
+	switch (gdk_option('gdk_switch_get_avatar')) {
 		case 1:
 		  $avatarsrc = 'https://cdn.jsdelivr.net/gh/yunluo/GitCafeApi/avatar/' . mt_rand(1, 1999) . '.jpg';
 		$avatar = "<img src=$avatarsrc class='avatar rand_avatar photo' />";
diff --git a/functions/optimization.php b/functions/optimization.php
index ee266be..b5f3be1 100644
--- a/functions/optimization.php
+++ b/functions/optimization.php
@@ -3,7 +3,7 @@
 
 
 //禁用新版编辑器
-if(gdk_get_option('gdk_diasble_gutenberg')){
+if(gdk_option('gdk_diasble_gutenberg')){
 add_filter('use_block_editor_for_post', '__return_false');
 remove_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
 }
@@ -12,7 +12,7 @@ remove_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
 add_filter('pre_option_link_manager_enabled', '__return_true');
 
 //移除 WP_Head 无关紧要的代码
-if(gdk_get_option('gdk_diasble_head_useless')){
+if(gdk_option('gdk_diasble_head_useless')){
 	remove_action('wp_head', 'wp_generator'); //删除 head 中的 WP 版本号
 	foreach (array('rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head') as $action) {
 	    remove_action($action, 'the_generator');
@@ -37,7 +37,7 @@ if(gdk_get_option('gdk_diasble_head_useless')){
 
 
 /**  开始关闭WordPress更新  **/
-if (gdk_get_option('gdk_diasble_wp_update')) {
+if (gdk_option('gdk_diasble_wp_update')) {
     add_filter('automatic_updater_disabled', '__return_true');	
     remove_action('init', 'wp_schedule_update_checks');	
     wp_clear_scheduled_hook('wp_version_check');
@@ -62,7 +62,7 @@ remove_filter( 'the_content', 'wpautop' );
 add_filter( 'the_content', 'wpautop' , 12);
 
 //禁用emoji功能
-if (gdk_get_option('gdk_disable_emojis')) {
+if (gdk_option('gdk_disable_emojis')) {
         function gdk_disable_emojis_link() {
             remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
             remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
@@ -83,14 +83,14 @@ if (gdk_get_option('gdk_disable_emojis')) {
 
 
 //禁用 XML-RPC 接口
-if (gdk_get_option('gdk_disable_xmlrpc')) {
+if (gdk_option('gdk_disable_xmlrpc')) {
 	add_filter('xmlrpc_enabled', '__return_false');
 	remove_action('xmlrpc_rsd_apis', 'rest_output_rsd');
 }
 
 
 //禁用日志修订功能
-if (gdk_get_option('gdk_disable_revision')) {
+if (gdk_option('gdk_disable_revision')) {
 	function gdk_disable_post_revisions() {
 		foreach ( get_post_types() as $post_type ) {
 			remove_post_type_support( $post_type, 'revisions' );
@@ -100,7 +100,7 @@ if (gdk_get_option('gdk_disable_revision')) {
 }
 
 //彻底关闭 pingback
-if (gdk_get_option('gdk_disable_trackbacks')) {
+if (gdk_option('gdk_disable_trackbacks')) {
 	add_filter('xmlrpc_methods', 'gdk_xmlrpc_methods');
 	function gdk_xmlrpc_methods($methods) {
 		unset($methods['system.multicall']);
@@ -115,7 +115,7 @@ if (gdk_get_option('gdk_disable_trackbacks')) {
 }
 
 //国内更新word press加速
-if (gdk_get_option('gdk_porxy_update') && !gdk_get_option('gdk_diasble_wp_update')) {
+if (gdk_option('gdk_porxy_update') && !gdk_option('gdk_diasble_wp_update')) {
 	add_filter('site_transient_update_core',function($value) {
 		foreach($value->updates as &$update) {
 			if($update->locale == 'zh_CN') {
diff --git a/functions/security.php b/functions/security.php
index 804ac81..ec35e2a 100644
--- a/functions/security.php
+++ b/functions/security.php
@@ -28,7 +28,7 @@ add_action( 'wp', 'gdk_prevent_script_injection' );
         }
     }
 
-if(gdk_get_option('gdk_lock_login')){
+if(gdk_option('gdk_lock_login')){
     if ( ! class_exists( 'GDK_Limit_Login_Attempts' ) ) {
         class GDK_Limit_Login_Attempts {
             var $failed_login_limit = 3;
@@ -38,8 +38,8 @@ if(gdk_get_option('gdk_lock_login')){
             var $transient_name     = 'attempted_login';
             //Transient used
             public function __construct() {
-                $failed_login_limit = gdk_get_option('gdk_failed_login_limit');
-                $lockout_duration   = gdk_get_option('gdk_lockout_duration');
+                $failed_login_limit = gdk_option('gdk_failed_login_limit');
+                $lockout_duration   = gdk_option('gdk_lockout_duration');
                 add_filter( 'authenticate', array( $this, 'check_attempted_login' ), 30, 3 );
                 add_action( 'wp_login_failed', array( $this, 'login_failed' ), 10, 1 );
             }
diff --git a/functions/seo.php b/functions/seo.php
index 5372e66..5cde1fc 100644
--- a/functions/seo.php
+++ b/functions/seo.php
@@ -1,5 +1,56 @@
 <?php
 
+//加载网站地图xml
+if(gdk_option('gdk_sitemap_xml')){
+    include('sitemap-xml.php');
+}
+
+//robots.txt优化功能
+if(gdk_option('gdk_robots')){
+        add_filter('robots_txt', 'gdk_robots_txt', 10, 2);
+    function gdk_robots_txt($robotext)
+    {
+        if(gdk_option('gdk_sitemap_xml')){
+            $sitemap = 'Sitemap: ' . home_url('/sitemap.xml');
+        } else {
+            $sitemap = '';
+        }
+        $robotext = "User-agent: *
+Disallow: /wp-admin/
+Disallow: /wp-content/plugins/
+Disallow: /wp-includes/
+Disallow: /*/trackback
+Disallow: /feed
+Disallow: /*/feed
+Disallow: /attachment/
+Disallow: /wp-content/themes/
+{$sitemap}";
+        return $robotext;
+    }
+}
+
+//文章自动内链
+if(gdk_option('gdk_tag_link')){
+        function gdk_tag_link($content)
+        {
+            $post_tags = get_the_tags();
+            if ($post_tags) {
+                foreach ($post_tags as $tag) {
+                    $link = get_tag_link($tag->term_id);
+                    $keyword = $tag->name;
+        
+                    $cleankeyword = stripslashes($keyword);
+                    $url = '<a target="_blank" href="'.$link.'" title="'.str_replace('%s', addcslashes($cleankeyword, '$'), '查看更多关于%s的文章').'">'.addcslashes($cleankeyword, '$').'</a>';
+                    $regEx = '\'(?!((<.*?)|(<a.*?)))('. $cleankeyword . ')(?!(([^<>]*?)>)|([^>]*?</a>))\'s';
+                    $content = preg_replace($regEx, $url, $content, gdk_option('gdk_tag_num') ?? 5);
+                }
+            }
+            return $content;
+        }
+    add_filter('the_content', 'gdk_tag_link', 1);
+}
+
+
 //给外部链接加上跳转
 
     function git_go_url($content){
diff --git a/modules/base/functions/sitemap-xml.php b/functions/sitemap-xml.php
similarity index 85%
rename from modules/base/functions/sitemap-xml.php
rename to functions/sitemap-xml.php
index 584e425..626556a 100644
--- a/modules/base/functions/sitemap-xml.php
+++ b/functions/sitemap-xml.php
@@ -11,7 +11,7 @@ function sitemap_xml_flush_rules(){
 
 // 添加自定义URL重写
 function sitemap_xml_custom_rewrite_rule() {
-    add_rewrite_rule('^sitemap(.*?)\.xml$','index.php?sitemap=nice$matches[1]','top');
+    add_rewrite_rule('^sitemap(.*?)\.xml$','index.php?sitemap=gdk$matches[1]','top');
 }
 
 function sitemap_xml_insert_query_vars( $vars ){
@@ -32,7 +32,7 @@ function sitemap_xml_api_handlers( $template ){
 
     $hook = explode('-', get_query_var( 'sitemap' ) );
     
-    if( isset( $hook[0] ) && $hook[0] === 'nice' ){
+    if( isset( $hook[0] ) && $hook[0] === 'gdk' ){
 
         if( isset( $hook[1] ) ){
             status_header(404);
@@ -42,11 +42,11 @@ function sitemap_xml_api_handlers( $template ){
             exit; 
         }
 
-        $sitemap = get_transient('nice-sitemap');
+        $sitemap = get_transient('gdk-sitemap');
         
         if( false === $sitemap || empty( $sitemap ) ){
-            $sitemap = nc_create_sitemap();
-            set_transient( 'nice-sitemap', $sitemap );
+            $sitemap = gdk_create_sitemap();
+            set_transient( 'gdk-sitemap', $sitemap );
         }
 
         header("Content-type: text/xml");
@@ -63,7 +63,7 @@ add_filter( 'redirect_canonical', 'sitemap_xml_cancel_redirect' );
 add_action( 'wp_loaded', 'sitemap_xml_flush_rules' );
 add_filter( 'template_include', 'sitemap_xml_api_handlers', 99 );
 
-function nc_create_sitemap() {
+function gdk_create_sitemap() {
 
     if ( str_replace( '-', '', get_option( 'gmt_offset' ) ) < 10 ) {
         $tempo = '-0' . str_replace( '-', '', get_option( 'gmt_offset' ) );
@@ -100,9 +100,9 @@ function nc_create_sitemap() {
     return $sitemap;
 }
 
-function nc_clear_sitemap_cache(){
-    delete_transient( 'nice-sitemap' );
+function gdk_clear_sitemap_cache(){
+    delete_transient( 'gdk-sitemap' );
 }
-add_action("publish_post", "nc_clear_sitemap_cache");
-add_action("publish_page", "nc_clear_sitemap_cache");
-add_action( "save_post", "nc_clear_sitemap_cache" );
+add_action("publish_post", "gdk_clear_sitemap_cache");
+add_action("publish_page", "gdk_clear_sitemap_cache");
+add_action( "save_post", "gdk_clear_sitemap_cache" );
diff --git a/modules/base/functions/seo-extra.php b/modules/base/functions/seo-extra.php
index e3f4e8f..25316d3 100644
--- a/modules/base/functions/seo-extra.php
+++ b/modules/base/functions/seo-extra.php
@@ -44,53 +44,8 @@ if ($others_seo['auto_nofollow']) {
     endif;
 }
 
-if ($others_seo['auto_tag_link_switcher']) {
-    if (!function_exists('nc_tag_link')):
-        function nc_tag_link($content)
-        {
-            $post_tags = get_the_tags();
 
-            if ($post_tags) {
-                foreach ($post_tags as $tag) {
-                    $link = get_tag_link($tag->term_id);
-                    $keyword = $tag->name;
-        
-                    $cleankeyword = stripslashes($keyword);
-                    $url = '<a target="_blank" href="'.$link.'" title="'.str_replace('%s', addcslashes($cleankeyword, '$'), __('View all posts in %s')).'">'.addcslashes($cleankeyword, '$').'</a>';
-                    $regEx = '\'(?!((<.*?)|(<a.*?)))('. $cleankeyword . ')(?!(([^<>]*?)>)|([^>]*?</a>))\'s';
-                    $content = preg_replace($regEx, $url, $content, $others_seo['auto_tag_link_switcher_limit'] ?? 5);
-                }
-            }
-            return $content;
-        }
-    add_filter('the_content', 'nc_tag_link', 1);
-    endif;
-}
-if ($general_options['improve_robots_txt']) {
-    if (!function_exists('nc_robots_txt')):
-        add_filter('robots_txt', 'nc_robots_txt', 10, 2);
 
-    function nc_robots_txt($robotext)
-    {
-        if (isset($GLOBALS['nice_sitemap_xml'])) {
-            $sitemap = 'Sitemap: ' . home_url('/sitemap.xml');
-        } else {
-            $sitemap = '';
-        }
-        $robotext = "User-agent: *
-Disallow: /wp-admin/
-Disallow: /wp-content/plugins/
-Disallow: /wp-includes/
-Disallow: /*/trackback
-Disallow: /feed
-Disallow: /*/feed
-Disallow: /attachment/
-Disallow: /wp-content/themes/
-{$sitemap}";
-        return $robotext;
-    }
-    endif;
-}
 
 if (isset($others_seo['baidu_submit']) && $others_seo['baidu_submit']) {
     add_action('post_updated', 'nc_baidu_submit');