Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/readme.md b/readme.md
index 5a45d2c..27a783d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
# WP-China-Yes
## 简介
-WP中国本土化社区（[WP-China.org][0]）出品，旨在将你的WordPress一键接入到本土生态体系中
+LitePress社区（[litepress.cn][0]）出品，旨在将你的WordPress一键接入到本土生态体系中
## 安装
如果你期望参与测试，可以直接Clone Master分支中的代码，此处是功能模块基本完整的测试版本。
@@ -9,7 +9,7 @@ WP中国本土化社区（[WP-China.org][0]）出品，旨在将你的WordPress
若期望用于正式环境请移步[发布列表][1]，下载最新稳定版的压缩包后直接访问[http://你的域名/wp-admin/plugin-install.php][2]，然后点击页面左上角的“上传插件”，上传安装即可。
## 插件截图
-
+
## 主要特性
- 对来自wordpress.org的所有外部服务进行加速
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 8007524..98c772b 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -2,9 +2,9 @@
/**
* Plugin Name: WP-China-Yes
* Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress
- * Author: WP中国本土化社区
- * Author URI:https://wp-china.org/
- * Version: 3.5.4
+ * Author: LitePress社区
+ * Author URI:https://litepress.cn/
+ * Version: 3.5.5
* Network: True
* License: GPLv3 or later
* License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -53,7 +53,6 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
update_option( "super_gravatar", get_option( 'super_gravatar' ) ?: '1' );
update_option( "super_googlefonts", get_option( 'super_googlefonts' ) ?: '2' );
update_option( "super_googleajax", get_option( 'super_googleajax' ) ?: '2' );
- update_option( "super_cdnjs", get_option( 'super_cdnjs' ) ?: '2' );
/**
@@ -65,7 +64,6 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
delete_option( "super_gravatar" );
delete_option( "super_googlefonts" );
delete_option( "super_googleajax" );
- delete_option( "super_cdnjs" );
} );
@@ -96,7 +94,7 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
) {
$this->page_str_replace( 'preg_replace', [
'~' . home_url( '/' ) . '(wp-admin|wp-includes)/(css|js)/~',
- sprintf( 'https://wpstatic.cdn.wepublish.cn/%s/$1/$2/', $GLOBALS['wp_version'] )
+ sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version'])
], get_option( 'super_admin' ) );
}
}
@@ -123,11 +121,6 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
* super_googlefonts用以标记用户是否启用谷歌字体加速功能
*/
register_setting( 'wpcy', 'super_googlefonts' );
-
- /**
- * super_cdnjs用以标记用户是否启用CDNJS加速功能
- */
- register_setting( 'wpcy', 'super_cdnjs' );
add_settings_section(
'wpcy_section_main',
@@ -175,14 +168,7 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
'wpcy',
'wpcy_section_main'
);
-
- add_settings_field(
- 'wpcy_field_select_super_cdnjs',
- '加速CDNJS前端公共库',
- [ $this, 'field_super_cdnjs_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
+
} );
/**
@@ -221,34 +207,25 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
/**
- * 替换谷歌字体为WePublish维护的加速节点
+ * 替换谷歌字体为 LitePress 维护的加速节点
*/
if ( get_option( 'super_googlefonts' ) != 2 ) {
$this->page_str_replace( 'str_replace', [
'fonts.googleapis.com',
- 'gfont.cdn.wepublish.cn'
+ 'googlefonts.wp-china-yes.net'
], get_option( 'super_googlefonts' ) );
}
/**
- * 替换谷歌前端公共库为WePublish维护的加速节点
+ * 替换谷歌前端公共库为 LitePress 维护的加速节点
*/
if ( get_option( 'super_googleajax' ) != 2 ) {
$this->page_str_replace( 'str_replace', [
'ajax.googleapis.com',
- 'gajax.cdn.wepublish.cn'
+ 'googleajax.wp-china-yes.net'
], get_option( 'super_googleajax' ) );
}
-
- /**
- * 替换CDNJS前端公共库为WePublish维护的加速节点
- */
- if ( get_option( 'super_cdnjs' ) != 2 ) {
- $this->page_str_replace( 'str_replace', [
- 'cdnjs.cloudflare.com/ajax/libs',
- 'cdnjs.cdn.wepublish.cn'
- ], get_option( 'super_cdnjs' ) );
- }
+
}
/**
@@ -337,10 +314,6 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
public function field_super_googleajax_cb() {
$this->field_cb( 'super_googleajax', '请只在包含谷歌前端公共库的情况下才启用该选项，以免造成不必要的性能损失' );
}
-
- public function field_super_cdnjs_cb() {
- $this->field_cb( 'super_cdnjs', '请只在包含CDNJS前端公共库的情况下才启用该选项，以免造成不必要的性能损失' );
- }
public function options_page_html() {
if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
@@ -349,7 +322,6 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
update_option( "super_gravatar", sanitize_text_field( $_POST['super_gravatar'] ) );
update_option( "super_googlefonts", sanitize_text_field( $_POST['super_googlefonts'] ) );
update_option( "super_googleajax", sanitize_text_field( $_POST['super_googleajax'] ) );
- update_option( "super_cdnjs", sanitize_text_field( $_POST['super_cdnjs'] ) );
echo '';
}
@@ -371,7 +343,7 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
- WP中国本土化社区的使命是帮助WordPress在中国建立起良好的本土生态环境，以求推进行业整体发展，做大市场蛋糕。
+ LitePress社区的使命是帮助WordPress在中国建立起良好的本土生态环境，以求推进行业整体发展，做大市场蛋糕。
特别感谢知更鸟、薇晓朵团队、AppNode在项目萌芽期给予的帮助。
From d01723c7373f9b026547ab3d3a306a7e4c794d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E9=94=A1=E6=BA=90?=
Date: Tue, 15 Nov 2022 00:05:27 +0800
Subject: [PATCH 03/54] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E6=8F=90?=
=?UTF-8?q?=E9=AB=98=E4=BB=93=E5=BA=93=E6=BA=90=E6=9B=BF=E6=8D=A2=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E9=81=BF?=
=?UTF-8?q?=E5=85=8D=E8=A2=AB=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
wp-china-yes.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 98c772b..bb73864 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -201,7 +201,7 @@ if ( ! class_exists( 'WP_CHINA_YES' ) ) {
}
return wp_remote_request( $url, $r );
- }, 1, 3 );
+ }, 999999, 3 );
}
From af8107006b9b05d169aaeee4b72146521e3c68cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E9=94=A1=E6=BA=90?=
Date: Tue, 15 Nov 2022 00:48:45 +0800
Subject: [PATCH 04/54] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2=20WP=20China=20=E9=93=BE=E6=8E=A5=E5=8F=8A=E6=8F=8F?=
=?UTF-8?q?=E8=BF=B0=E4=B8=BA=20LitePress?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
readme.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/readme.md b/readme.md
index 27a783d..4052949 100644
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,7 @@ LitePress社区（[litepress.cn][0]）出品，旨在将你的WordPress一键接
## 主要特性
- 对来自wordpress.org的所有外部服务进行加速
- 对来自谷歌公共库的一些服务进行加速
- - 对接[本土翻译平台][3]，为WordPress本身及官方应用市场中的所有应用推送基于AI翻译+人工辅助校准的全量汉化包
+ - 对接[LitePress翻译平台][3]，为WordPress本身及官方应用市场中的所有应用推送基于AI翻译+人工辅助校准的全量汉化包
- 使WordPress内置应用市场支持中文作品信息展示及中文语义化搜索（开发中）
- 使WordPress内置应用市场中支持选购国内开发者所推出的优秀作品并享受集成式的安装及更新推送服务（开发中）
@@ -24,7 +24,7 @@ LitePress社区（[litepress.cn][0]）出品，旨在将你的WordPress一键接
你可以选择以下三种方式反馈问题：
1. 提交一个[Issue][4]
- 2. 在本土化社区的[论坛][5]中提交一个帖子
+ 2. 在LitePress社区的[论坛][5]中提交一个帖子
3. 加项目交流QQ群：1046115671
无论选择何种方式提交问题，都希望你可以详细描述问题的表现及触发条件，这样对减少交流成本及快速定位问题有很大好处。
@@ -44,14 +44,14 @@ LitePress社区（[litepress.cn][0]）出品，旨在将你的WordPress一键接
-[0]: https://wp-china.org
+[0]: https://litepress.cn
-[1]: https://github.com/wp-china/wp-china-yes/releases
+[1]: https://github.com/litepress/wp-china-yes/releases
[2]: http://你的域名/wp-admin/plugin-install.php
-[3]: https://translate.wp-china.org
+[3]: https://litepress.cn/translate/
-[4]: https://github.com/wp-china/wp-china-yes/issues
+[4]: https://github.com/litepress/wp-china-yes/issues
-[5]: https://wp-china.org/forums
+[5]: https://litepress.cn/forums
From e1a6083779cf2d54737ba7f13cca92716aa6e281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Fri, 8 Mar 2024 20:36:09 +0800
Subject: [PATCH 05/54] =?UTF-8?q?refactor:=20=E5=85=A8=E5=B1=80=E9=87=8D?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/ISSUE_TEMPLATE/bug_report.yml | 101 +++++
.github/ISSUE_TEMPLATE/config.yml | 5 +
.github/ISSUE_TEMPLATE/feature_request.yml | 55 +++
.github/workflows/update-changelog.yml | 31 ++
.gitignore | 1 +
CHANGELOG.md | 4 +
Plugin.php | 98 +++++
Service/Base.php | 29 ++
Service/Setting.php | 267 +++++++++++++
Service/Super.php | 324 ++++++++++++++++
Service/Update.php | 24 ++
composer.json | 24 ++
composer.lock | 113 ++++++
license | 2 +-
readme.md | 71 ++--
wp-china-yes.php | 416 ++-------------------
16 files changed, 1127 insertions(+), 438 deletions(-)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
create mode 100644 .github/ISSUE_TEMPLATE/config.yml
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
create mode 100644 .github/workflows/update-changelog.yml
create mode 100644 .gitignore
create mode 100644 CHANGELOG.md
create mode 100644 Plugin.php
create mode 100644 Service/Base.php
create mode 100644 Service/Setting.php
create mode 100644 Service/Super.php
create mode 100644 Service/Update.php
create mode 100644 composer.json
create mode 100644 composer.lock
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..1d278bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,101 @@
+name: 报告问题 (Bug Report)
+description: 创建一个报告以帮助我们改进 (Create a report to help us improve)
+title: "[Bug Report]: "
+labels: ["bug"]
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ **请仅使用 简体中文 或 英文 进行填写**
+ **Please only use Simplified Chinese or English to fill in**
+ - type: checkboxes
+ id: checks
+ attributes:
+ label: 在提问之前 (Before asking)
+ description: |
+ 提问之前，先回答几个小问题。
+ Before asking questions, answer a few quick questions.
+ options:
+ - label: 我已经搜索了现有的 Issues 和 Discussions (I've searched the existing Issues and Discussions)
+ required: true
+ - label: 我已经阅读了 README 中除版本记录以外的所有内容 (I've read everything in the README except the version notes)
+ required: true
+ - label: 我在提问题之前至少花费了 5 分钟来思考和准备 (I spend at least 5 minutes thinking and preparing before asking a question)
+ required: true
+ - label: 这个问题出现在最新版的 WP-China-Yes 上 (This question appears on the latest version of WP-China-Yes)
+ required: false
+ - label: 我使用过旧版的 WP-China-Yes 并且没有出现这个问题 (I've used an older version of WP-China-Yes and didn't have this problem)
+ required: false
+ - label: 这个问题出现了至少 3 次 (This question has occurred at least 3 times)
+ required: false
+ - type: textarea
+ id: describe
+ attributes:
+ label: 描述问题 (Describe the problem)
+ description: |
+ 简明概要地描述你遇到的问题。
+ Briefly describe the problem you are having.
+ validations:
+ required: true
+ - type: textarea
+ id: expected
+ attributes:
+ label: 预期行为 (Expected behavior)
+ description: |
+ 简明概要地描述你期望发生的事情。
+ Briefly describe what you expect to happen.
+ validations:
+ required: true
+ - type: textarea
+ id: reproduce
+ attributes:
+ label: 如何复现 (How to reproduce)
+ description: |
+ 重现该问题的详细步骤。
+ Detailed steps to reproduce the problem.
+ value: |
+ 1. 安装 WP-China-Yes
+ 2. 设置 '...'
+ 3. 点击 '...'
+ 4. 出现问题
+ validations:
+ required: false
+ - type: textarea
+ id: logs
+ attributes:
+ label: 相关日志 (Related logs)
+ description: |
+ 请复制并粘贴任何相关的日志输出。
+ Please copy and paste any relevant log output.
+ 可以把文件拖入这个区域以添加日志文件。
+ Files can be dragged into this area to add log files.
+ 日志文件可通过开启 WordPress 的调试模式获取。
+ Log files can be accessed by enabling WordPress debug mode.
+ render: Text
+ validations:
+ required: false
+ - type: textarea
+ id: screenshots
+ attributes:
+ label: 截图 (Screenshots)
+ description: |
+ 如果有，添加屏幕截图可帮助更快定位你的问题。
+ If so, adding screenshots can help locate your issue faster.
+ 可以复制图片后在此区域内粘贴以添加图片。
+ Pictures can be copied and pasted in this area to add pictures.
+ 如有必要，使用马赛克遮盖敏感信息。
+ Use a mosaic to obscure sensitive information if necessary.
+ validations:
+ required: false
+ - type: textarea
+ id: others
+ attributes:
+ label: 还有别的吗 (Anything else)
+ description: |
+ 运行环境？浏览器？WordPress 版本？相关的配置？链接？参考资料？
+ Environment? Browser? WordPress version? Related configuration? Link? References?
+ 任何能让我们对你所遇到的问题有更多了解的东西。
+ Anything that can give us more insight into the problem you're having.
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..c117656
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+ - name: 讨论、问答和非项目问题 (Discussions, questions, and non-project issues)
+ url: https://jq.qq.com/?_wv=1027&k=I1oJKSTH
+ about: 其他不明之处，请移步我们的QQ群 12370907 (For other unclear things, please move to our qq group 12370907)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..5e9619d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,55 @@
+name: 功能请求 (Feature request)
+description: 为这个项目提出一个想法 (Suggest an idea for this project)
+title: "[Feature Request]: "
+labels: ["enhancement"]
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ **请仅使用 简体中文 或 英文 进行填写**
+ **Please only use Simplified Chinese or English to fill in**
+ - type: checkboxes
+ attributes:
+ label: 在提问之前 (Before asking)
+ description: |
+ 提问之前，先回答几个小问题。
+ Before asking questions, answer a few quick questions.
+ options:
+ - label: 我已经搜索了全部 Issues 和 Commits (I have searched all Issues and Commits)
+ required: true
+ - label: 它们当中没有我将要提交的新功能 (None of them have new feature that I'm going to submit)
+ required: true
+ - type: textarea
+ id: feature
+ attributes:
+ label: 描述功能 (Describe feature)
+ description: |
+ 简明概要地描述你的新功能，以及它将解决什么问题。
+ Briefly describe your new feature and what problem it will solve.
+ validations:
+ required: true
+ - type: textarea
+ id: workflow
+ attributes:
+ label: 工作流程 (Workflow)
+ description: |
+ 请向我们提供有关该功能的实现流程。
+ Please provide us with the implementation flow for this feature.
+ value: |
+ 1. 新建文件 ....
+ 2. 添加函数 ....
+ 3. ...
+ validations:
+ required: true
+ - type: textarea
+ id: others
+ attributes:
+ label: 还有别的吗 (Anything else)
+ description: |
+ 运行环境？浏览器？WordPress 版本？相关的配置？链接？参考资料？
+ Environment? Browser? WordPress version? Related configuration? Link? References?
+ 任何能让我们对该功能的实现有更多帮助的东西。
+ Anything that can help us more with the implementation of this feature.
+ validations:
+ required: false
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
new file mode 100644
index 0000000..07e3c7d
--- /dev/null
+++ b/.github/workflows/update-changelog.yml
@@ -0,0 +1,31 @@
+name: "Update Changelog"
+
+on:
+ release:
+ types: [released]
+
+jobs:
+ update:
+ runs-on: ubuntu-latest
+
+ permissions:
+ contents: write
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+ with:
+ ref: main
+
+ - name: Update Changelog
+ uses: stefanzweifel/changelog-updater-action@v1
+ with:
+ latest-version: ${{ github.event.release.tag_name }}
+ release-notes: ${{ github.event.release.body }}
+
+ - name: Commit updated CHANGELOG
+ uses: stefanzweifel/git-auto-commit-action@v5
+ with:
+ branch: main
+ commit_message: "docs: Update CHANGELOG"
+ file_pattern: CHANGELOG.md
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5657f6e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vendor
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9d8a8f3
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+
+All notable changes to `WP-China-Yes` will be documented in this file.
+
diff --git a/Plugin.php b/Plugin.php
new file mode 100644
index 0000000..1d3f726
--- /dev/null
+++ b/Plugin.php
@@ -0,0 +1,98 @@
+' . sprintf( __( 'WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。',
+ 'wp-china-yes' ),
+ PHP_VERSION ) . '
';
+ }
+ if ( is_plugin_active( 'wp-china-no/wp-china-no.php' ) ) {
+ deactivate_plugins( 'wp-china-no/wp-china-no.php' );
+ $notices[] = '
+
' . __( '检测到旧版插件 WP-China-No，已自动禁用！', 'wp-china-yes' ) . '
+
+
' . __( '检测到不兼容的插件 WP-China-Plus，已自动禁用！', 'wp-china-yes' ) . '
+
+
' . __( '检测到不兼容的插件 Kill 429，已自动禁用！', 'wp-china-yes' ) . '
+
+
' . __( '检测到已在 WordPress 配置文件中设置代理服务器，这可能会导致插件无法正常工作！',
+ 'wp-china-yes' ) . '
+
WP-China-Yes
';
+ echo '将您的 WordPress 接入本土生态体系，这将为您提供一个更贴近中国人使用习惯的 WordPress。
100% 开源代码，一起参与文派（WordPress）软件国产化进程，打造属于您自己的开源自助建站程序。
';
+ echo <<
+ .container {
+ display: flex;
+ flex-wrap: wrap;
+ width: 100%;
+ }
+ .left-column, .right-column {
+ width: 100%;
+ }
+ .left-column {
+ background-color: #f0f0f0;
+ }
+ .right-column {
+ padding: 20px;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+ }
+ .card {
+ background-color: #fff;
+ padding: 20px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+ border-radius: 4px;
+ }
+ .card h3 {
+ margin-top: 0;
+ }
+ .card a {
+ text-decoration: none;
+ }
+ .card-body, .card-footer {
+ margin: 10px 0;
+ }
+
+ .sponsor-logos {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ }
+
+ .sponsor-logos img {
+ width: 30%;
+ margin-bottom: 12px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ height: fit-content;
+ }
+
+ @media (min-width: 768px) {
+ .container {
+ flex-wrap: nowrap;
+ }
+ .left-column {
+ width: 70%;
+ }
+ .right-column {
+ width: 30%;
+ }
+ }
+
+
+
+HTML;
+ $this->setting_api->show_navigation();
+ $this->setting_api->show_forms();
+
+ echo <<
+
+
+
项目简介
+
+ 文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
+
+
+
+
+
+
+
+
+
+
+
+
提示：此处选项设置并不与任何文派插件及独立功能扩展冲突，可放心安装启用。
+
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
+HTML;
+
+ }
+}
diff --git a/Service/Super.php b/Service/Super.php
new file mode 100644
index 0000000..b2962b7
--- /dev/null
+++ b/Service/Super.php
@@ -0,0 +1,324 @@
+ 'wenpai',
+ 'admincdn' => [
+ 'admin' => 'admin',
+ ],
+ 'cravatar' => 'cn',
+ 'windfonts' => 'off',
+ 'adblock' => 'off',
+ ];
+
+ public function __construct() {
+ $this->settings = is_multisite() ? get_site_option( 'wp_china_yes' ) : get_option( 'wp_china_yes' );
+ $this->settings = wp_parse_args( $this->settings, $this->default );
+
+ /**
+ * WordPress.Org API 替换
+ */
+ if ( is_admin() || wp_doing_cron() ) {
+ if ( $this->settings['store'] != 'off' ) {
+ add_filter( 'pre_http_request', [ $this, 'filter_wordpress_org' ], 100, 3 );
+ }
+ }
+
+ /**
+ * 添加「文派茶馆」小组件
+ */
+ if ( is_admin() ) {
+ add_action( 'wp_dashboard_setup', function () {
+ global $wp_meta_boxes;
+
+ unset( $wp_meta_boxes['dashboard']['side']['core']['dashboard_primary'] );
+ wp_add_dashboard_widget( 'wenpai_tea', '文派茶馆', function () {
+ echo <<
+
+
+
+ HTML;
+ } );
+ } );
+ add_action( 'wp_network_dashboard_setup', function () {
+ global $wp_meta_boxes;
+
+ unset( $wp_meta_boxes['dashboard-network']['side']['core']['dashboard_primary'] );
+ wp_add_dashboard_widget( 'wenpai_tea', '文派茶馆', function () {
+ echo <<
+
+
+
+ HTML;
+ } );
+ } );
+ }
+
+ /**
+ * WordPress 核心静态文件链接替换
+ */
+ if ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+ if (
+ ! empty( $this->settings['admincdn']['admin'] ) &&
+ ! stristr( $GLOBALS['wp_version'], 'alpha' ) &&
+ ! stristr( $GLOBALS['wp_version'], 'beta' ) &&
+ ! stristr( $GLOBALS['wp_version'], 'RC' )
+ ) {
+ // 禁用合并加载，以便于使用公共资源节点
+ global $concatenate_scripts;
+ $concatenate_scripts = false;
+
+ $this->page_str_replace( 'preg_replace', [
+ '~' . home_url( '/' ) . '(wp-admin|wp-includes)/(css|js)/~',
+ sprintf( 'https://wpstatic.admincdn.com/%s/$1/$2/', $GLOBALS['wp_version'] )
+ ] );
+ }
+ }
+
+ if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+ /**
+ * 前台静态加速
+ */
+ if ( ! empty( $this->settings['admincdn']['frontend'] ) ) {
+ add_action( 'template_redirect', function () {
+ ob_start( function ( $content ) {
+ $regex = '#(?<=[(\"\'])(?:' . quotemeta( home_url() ) . ')?/(?:((?:wp-content|wp-includes)[^\"\')]+\.(css|js)[^\"\')]+))(?=[\"\')])#';
+
+ return preg_replace_callback( $regex, function ( $asset ) {
+ return 'https://public.admincdn.com/' . $asset[0];
+ }, $content );
+ } );
+ } );
+ }
+
+ /**
+ * Google 字体替换
+ */
+ if ( ! empty( $this->settings['admincdn']['googlefonts'] ) ) {
+ $this->page_str_replace( 'str_replace', [
+ 'fonts.googleapis.com',
+ 'googlefonts.admincdn.com'
+ ] );
+ }
+
+ /**
+ * Google 前端公共库替换
+ */
+ if ( ! empty( $this->settings['admincdn']['googleajax'] ) ) {
+ $this->page_str_replace( 'str_replace', [
+ 'ajax.googleapis.com',
+ 'googleajax.admincdn.com'
+ ] );
+ }
+
+ /**
+ * CDNJS 前端公共库替换
+ */
+ if ( ! empty( $this->settings['admincdn']['cdnjs'] ) ) {
+ $this->page_str_replace( 'str_replace', [
+ 'cdnjs.cloudflare.com/ajax/libs',
+ 'cdnjs.admincdn.com'
+ ] );
+ }
+ }
+
+ /**
+ * 初认头像
+ */
+ if ( ! empty( $this->settings['cravatar'] ) ) {
+ add_filter( 'user_profile_picture_description', [ $this, 'set_user_profile_picture_for_cravatar' ], 1 );
+ add_filter( 'avatar_defaults', [ $this, 'set_defaults_for_cravatar' ], 1 );
+ add_filter( 'um_user_avatar_url_filter', [ $this, 'get_cravatar_url' ], 1 );
+ add_filter( 'bp_gravatar_url', [ $this, 'get_cravatar_url' ], 1 );
+ add_filter( 'get_avatar_url', [ $this, 'get_cravatar_url' ], 1 );
+ }
+ }
+
+ /**
+ * WordPress.Org 替换
+ */
+ public function filter_wordpress_org( $preempt, $args, $url ) {
+ if ( ( ! strpos( $url, 'api.wordpress.org' ) && ! strpos( $url,
+ 'downloads.wordpress.org' ) ) ) {
+ return $preempt;
+ }
+
+ if ( $this->settings['store'] == 'wenpai' ) {
+ $url = str_replace( 'api.wordpress.org', 'api.wenpai.org', $url );
+ } else {
+ $url = str_replace( 'api.wordpress.org', 'wpa.cdn.haozi.net', $url );
+ }
+ $url = str_replace( 'downloads.wordpress.org', 'wpd.cdn.haozi.net', $url );
+
+ $curl_version = '1.0.0';
+ if ( function_exists( 'curl_version' ) ) {
+ $curl_version_array = curl_version();
+ if ( is_array( $curl_version_array ) && key_exists( 'version', $curl_version_array ) ) {
+ $curl_version = $curl_version_array['version'];
+ }
+ }
+ if ( version_compare( $curl_version, '7.15.0', '<' ) ) {
+ $url = str_replace( 'https://', 'http://', $url );
+ }
+
+ return wp_remote_request( $url, $args );
+ }
+
+ /**
+ * 初认头像替换
+ */
+ public function get_cravatar_url( $url ) {
+ switch ( $this->settings['cravatar'] ) {
+ case 'cn':
+ return $this->replace_avatar_url( $url, 'cn.cravatar.com' );
+ case 'global':
+ return $this->replace_avatar_url( $url, 'en.cravatar.com' );
+ case 'weavatar':
+ return $this->replace_avatar_url( $url, 'weavatar.com' );
+ default:
+ return $url;
+ }
+ }
+
+ /**
+ * 头像 URL 替换
+ */
+ public function replace_avatar_url( $url, $domain ) {
+ $sources = array(
+ 'www.gravatar.com',
+ '0.gravatar.com',
+ '1.gravatar.com',
+ '2.gravatar.com',
+ 's.gravatar.com',
+ 'secure.gravatar.com',
+ 'cn.gravatar.com',
+ 'en.gravatar.com',
+ 'gravatar.com',
+ 'sdn.geekzu.org',
+ 'gravatar.duoshuo.com',
+ 'gravatar.loli.net',
+ 'dn-qiniu-avatar.qbox.me'
+ );
+
+ return str_replace( $sources, $domain, $url );
+ }
+
+ /**
+ * WordPress 讨论设置中的默认 LOGO 名称替换
+ */
+ public function set_defaults_for_cravatar( $avatar_defaults ) {
+ $avatar_defaults['gravatar_default'] = '初认头像';
+
+ return $avatar_defaults;
+ }
+
+ /**
+ * 个人资料卡中的头像上传地址替换
+ */
+ public function set_user_profile_picture_for_cravatar() {
+ return '
您可以在初认头像修改您的资料图片';
+ }
+
+ /**
+ * 页面替换
+ *
+ * @param $replace_func string 要调用的字符串关键字替换函数
+ * @param $param array 传递给字符串替换函数的参数
+ */
+ private function page_str_replace( $replace_func, $param ) {
+ add_action( 'init', function () use ( $replace_func, $param ) {
+ ob_start( function ( $buffer ) use ( $replace_func, $param ) {
+ $param[] = $buffer;
+
+ return call_user_func_array( $replace_func, $param );
+ } );
+ }, 999999 );
+ }
+}
diff --git a/Service/Update.php b/Service/Update.php
new file mode 100644
index 0000000..c8a5951
--- /dev/null
+++ b/Service/Update.php
@@ -0,0 +1,24 @@
+=5.6"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "TheTNB\\Setting\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-3.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "耗子",
+ "email": "i@haozi.net"
+ }
+ ],
+ "description": "WordPress Setting API for developers",
+ "homepage": "https://github.com/thetnb/wp-setting-api",
+ "keywords": [
+ "wordpress"
+ ],
+ "support": {
+ "issues": "https://github.com/TheTNB/wp-setting-api/issues",
+ "source": "https://github.com/TheTNB/wp-setting-api/tree/2.0.2"
+ },
+ "time": "2024-03-08T07:11:27+00:00"
+ },
+ {
+ "name": "yahnis-elsts/plugin-update-checker",
+ "version": "v5.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/YahnisElsts/plugin-update-checker.git",
+ "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/e8e53e6d98e37fa7c895c93417f52e3775494715",
+ "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "php": ">=5.6.20"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "load-v5p4.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Yahnis Elsts",
+ "email": "whiteshadow@w-shadow.com",
+ "homepage": "https://w-shadow.com/",
+ "role": "Developer"
+ }
+ ],
+ "description": "A custom update checker for WordPress plugins and themes. Useful if you can't host your plugin in the official WP repository but still want it to support automatic updates.",
+ "homepage": "https://github.com/YahnisElsts/plugin-update-checker/",
+ "keywords": [
+ "automatic updates",
+ "plugin updates",
+ "theme updates",
+ "wordpress"
+ ],
+ "support": {
+ "issues": "https://github.com/YahnisElsts/plugin-update-checker/issues",
+ "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.4"
+ },
+ "time": "2024-02-24T09:56:49+00:00"
+ }
+ ],
+ "packages-dev": [],
+ "aliases": [],
+ "minimum-stability": "stable",
+ "stability-flags": [],
+ "prefer-stable": false,
+ "prefer-lowest": false,
+ "platform": [],
+ "platform-dev": [],
+ "plugin-api-version": "2.6.0"
+}
diff --git a/license b/license
index 3c67163..f288702 100644
--- a/license
+++ b/license
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2020 LitePress社区
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/readme.md b/readme.md
index 4052949..0cd9af6 100644
--- a/readme.md
+++ b/readme.md
@@ -1,57 +1,44 @@
# WP-China-Yes
+文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，生生不息。
+
## 简介
-LitePress社区（[litepress.cn][0]）出品，旨在将你的WordPress一键接入到本土生态体系中
+
+文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
+
+## 功能
+
+- [x] 优化 WordPress 相关服务在中国大陆的访问速度
+- [x] 优化 WordPress 后台加载速度
+- [x] 优化 WordPress 前台加载速度
+- [x] 移除后台无用请求与组件
+- [x] 替换 Gravatar 头像为[初认头像](https://cravatar.com/)
+- [x] 优化 谷歌字体 加载速度
+- [x] 优化 谷歌前端库 加载速度
+- [x] 优化 CDNJS 加载速度
## 安装
-如果你期望参与测试，可以直接Clone Master分支中的代码，此处是功能模块基本完整的测试版本。
-若期望用于正式环境请移步[发布列表][1]，下载最新稳定版的压缩包后直接访问[http://你的域名/wp-admin/plugin-install.php][2]，然后点击页面左上角的“上传插件”，上传安装即可。
+同其他 WordPress 插件一样，**从 Release 页面下载最新版本的插件**（不要直接下载源码！！！），在后台插件管理页面上传并启用即可。
-## 插件截图
-
-
-## 主要特性
- - 对来自wordpress.org的所有外部服务进行加速
- - 对来自谷歌公共库的一些服务进行加速
- - 对接[LitePress翻译平台][3]，为WordPress本身及官方应用市场中的所有应用推送基于AI翻译+人工辅助校准的全量汉化包
- - 使WordPress内置应用市场支持中文作品信息展示及中文语义化搜索（开发中）
- - 使WordPress内置应用市场中支持选购国内开发者所推出的优秀作品并享受集成式的安装及更新推送服务（开发中）
+当然，你也可以选择将插件手动上传到`wp-content/plugins`目录下，然后在后台启用。
## 问题反馈
-需要着重说明一下：**任何问题都会在第一时间得到积极的处理**，所以，有问题尽管提。
-你可以选择以下三种方式反馈问题：
+对于 WordPress 相关的问题，可在 [文派支持论坛](https://wenpai.org/support) 提问寻求帮助。
- 1. 提交一个[Issue][4]
- 2. 在LitePress社区的[论坛][5]中提交一个帖子
- 3. 加项目交流QQ群：1046115671
+对于此插件自身问题，可在`Issues`页面提交问题反馈，注意[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)。
-无论选择何种方式提交问题，都希望你可以详细描述问题的表现及触发条件，这样对减少交流成本及快速定位问题有很大好处。
-
-## 参与项目发展
-
-对于普通用户来讲，最好的参与项目发展的方式就是帮助项目宣传推广及参与[翻译贡献][3]
-
-如果你有好的Idea，或是对参与项目开发有兴趣可以加项目交流QQ群：1046115671
-
-我想，对于在校大学生来讲，参与一个开源项目无疑是积累开发经验的最好方式。同时，工作并不是完全无偿的，项目赞助商会视情况为每位开发者提供周期性资金支持。
+交流QQ群：[1046115671](https://qm.qq.com/q/BATf8KsCje)
## 赞助商
-### 服务器及管理软件
-
-
-
-
-[0]: https://litepress.cn
-
-[1]: https://github.com/litepress/wp-china-yes/releases
-
-[2]: http://你的域名/wp-admin/plugin-install.php
-
-[3]: https://litepress.cn/translate/
-
-[4]: https://github.com/litepress/wp-china-yes/issues
-
-[5]: https://litepress.cn/forums
+
+
+
+
+
+
+
+
+
diff --git a/wp-china-yes.php b/wp-china-yes.php
index bb73864..3752e6d 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -1,407 +1,33 @@
page_url = network_admin_url( is_multisite() ? 'settings.php?page=wp-china-yes' : 'options-general.php?page=wp-china-yes' );
- }
+require_once( plugin_dir_path( __FILE__ ) . 'vendor/autoload.php' );
- public function init() {
- if ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
- /**
- * 插件列表项目中增加设置项
- */
- add_filter( sprintf( '%splugin_action_links_%s', is_multisite() ? 'network_admin_' : '', plugin_basename( __FILE__ ) ), function ( $links ) {
- return array_merge(
- [ sprintf( '%s', $this->page_url, '设置' ) ],
- $links
- );
- } );
+// 注册插件激活钩子
+register_activation_hook( PLUGIN_FILE, [ Plugin::class, 'activate' ] );
+// 注册插件删除钩子
+register_uninstall_hook( PLUGIN_FILE, [ Plugin::class, 'uninstall' ] );
-
- /**
- * 插件列表页中所有插件增加“翻译校准”链接
- */
- // if (get_option('wpapi') == 1) {
- add_filter( sprintf( '%splugin_action_links', is_multisite() ? 'network_admin_' : '' ), function ( $links, $plugin = '' ) {
- $links[] = '参与翻译';
-
- return $links;
- }, 10, 2 );
- //}
-
-
- /**
- * 初始化设置项
- */
- update_option( "wpapi", get_option( 'wpapi' ) ?: '2' );
- update_option( "super_admin", get_option( 'super_admin' ) ?: '2' );
- update_option( "super_gravatar", get_option( 'super_gravatar' ) ?: '1' );
- update_option( "super_googlefonts", get_option( 'super_googlefonts' ) ?: '2' );
- update_option( "super_googleajax", get_option( 'super_googleajax' ) ?: '2' );
-
-
- /**
- * 禁用插件时删除配置
- */
- register_deactivation_hook( __FILE__, function () {
- delete_option( "wpapi" );
- delete_option( "super_admin" );
- delete_option( "super_gravatar" );
- delete_option( "super_googlefonts" );
- delete_option( "super_googleajax" );
- } );
-
-
- /**
- * 菜单注册
- */
- add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', function () {
- add_submenu_page(
- is_multisite() ? 'settings.php' : 'options-general.php',
- 'WP-China-Yes',
- 'WP-China-Yes',
- is_multisite() ? 'manage_network_options' : 'manage_options',
- 'wp-china-yes',
- [ $this, 'options_page_html' ]
- );
- } );
-
-
- /**
- * 将WordPress核心所依赖的静态文件访问链接替换为公共资源节点
- */
- if (
- get_option( 'super_admin' ) != 2 &&
- ! stristr( $GLOBALS['wp_version'], 'alpha' ) &&
- ! stristr( $GLOBALS['wp_version'], 'beta' ) &&
- ! stristr( $GLOBALS['wp_version'], 'RC' ) &&
- ! isset( $GLOBALS['lp_version'] )
- ) {
- $this->page_str_replace( 'preg_replace', [
- '~' . home_url( '/' ) . '(wp-admin|wp-includes)/(css|js)/~',
- sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version'])
- ], get_option( 'super_admin' ) );
- }
- }
-
-
- if ( is_admin() || wp_doing_cron() ) {
- add_action( 'admin_init', function () {
- /**
- * wpapi用以标记用户所选的仓库api，数值说明：1 使用LitePress的API，2 只是经代理加速的api.wordpress.org原版API
- */
- register_setting( 'wpcy', 'wpapi' );
-
- /**
- * super_admin用以标记用户是否启用管理后台加速功能
- */
- register_setting( 'wpcy', 'super_admin' );
-
- /**
- * super_gravatar用以标记用户是否启用Cravatar头像功能
- */
- register_setting( 'wpcy', 'super_gravatar' );
-
- /**
- * super_googlefonts用以标记用户是否启用谷歌字体加速功能
- */
- register_setting( 'wpcy', 'super_googlefonts' );
-
- add_settings_section(
- 'wpcy_section_main',
- '将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress',
- '',
- 'wpcy'
- );
-
- add_settings_field(
- 'wpcy_field_select_wpapi',
- '选择应用市场',
- [ $this, 'field_wpapi_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
-
- add_settings_field(
- 'wpcy_field_select_super_admin',
- '加速管理后台',
- [ $this, 'field_super_admin_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
-
- add_settings_field(
- 'wpcy_field_select_super_gravatar',
- '使用 Cravatar 头像',
- [ $this, 'field_super_gravatar_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
-
- add_settings_field(
- 'wpcy_field_select_super_googlefonts',
- '加速谷歌字体',
- [ $this, 'field_super_googlefonts_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
-
- add_settings_field(
- 'wpcy_field_select_super_googleajax',
- '加速谷歌前端公共库',
- [ $this, 'field_super_googleajax_cb' ],
- 'wpcy',
- 'wpcy_section_main'
- );
-
- } );
-
- /**
- * 替换api.wordpress.org和downloads.wordpress.org为WP-China.org维护的大陆加速节点
- * URL替换代码来自于我爱水煮鱼(http://blog.wpjam.com/)开发的WPJAM Basic插件
- */
- add_filter( 'pre_http_request', function ( $preempt, $r, $url ) {
- if ( ( ! stristr( $url, 'api.wordpress.org' ) && ! stristr( $url, 'downloads.wordpress.org' ) ) || get_option( 'wpapi' ) == 3 ) {
- return $preempt;
- }
- if ( get_option( 'wpapi' ) == 1 ) {
- $url = str_replace( 'api.wordpress.org', 'api.litepress.cn', $url );
- $url = str_replace( 'downloads.wordpress.org', 'd.w.org.ibadboy.net', $url );
- } else {
- $url = str_replace( 'api.wordpress.org', 'api.w.org.ibadboy.net', $url );
- $url = str_replace( 'downloads.wordpress.org', 'd.w.org.ibadboy.net', $url );
- }
-
- $curl_version = '1.0.0';
- if ( function_exists( 'curl_version' ) ) {
- $curl_version_array = curl_version();
- if ( is_array( $curl_version_array ) && key_exists( 'version', $curl_version_array ) ) {
- $curl_version = $curl_version_array['version'];
- }
- }
-
- // 如果CURL版本小于7.15.0，说明不支持SNI，无法通过HTTPS访问又拍云的节点，故而改用HTTP
- if ( version_compare( $curl_version, '7.15.0', '<' ) ) {
- $url = str_replace( 'https://', 'http://', $url );
- }
-
- return wp_remote_request( $url, $r );
- }, 999999, 3 );
- }
-
-
- if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
- /**
- * 替换谷歌字体为 LitePress 维护的加速节点
- */
- if ( get_option( 'super_googlefonts' ) != 2 ) {
- $this->page_str_replace( 'str_replace', [
- 'fonts.googleapis.com',
- 'googlefonts.wp-china-yes.net'
- ], get_option( 'super_googlefonts' ) );
- }
-
- /**
- * 替换谷歌前端公共库为 LitePress 维护的加速节点
- */
- if ( get_option( 'super_googleajax' ) != 2 ) {
- $this->page_str_replace( 'str_replace', [
- 'ajax.googleapis.com',
- 'googleajax.wp-china-yes.net'
- ], get_option( 'super_googleajax' ) );
- }
-
- }
-
- /**
- * 替换Gravatar头像为Cravatar头像
- */
- if ( get_option( 'super_gravatar' ) == 1 ) {
- if ( ! function_exists( 'get_cravatar_url' ) ) {
- /**
- * 替换Gravatar头像为Cravatar头像
- *
- * Cravatar是Gravatar在中国的完美替代方案，你可以在https://cravatar.cn更新你的头像
- */
- function get_cravatar_url( $url ) {
- $sources = array(
- 'www.gravatar.com',
- '0.gravatar.com',
- '1.gravatar.com',
- '2.gravatar.com',
- 'secure.gravatar.com',
- 'cn.gravatar.com',
- 'gravatar.com',
- );
-
- return str_replace( $sources, 'cravatar.cn', $url );
- }
-
- /**
- * 替换WordPress讨论设置中的默认LOGO名称
- */
- function set_defaults_for_cravatar( $avatar_defaults ) {
- $avatar_defaults['gravatar_default'] = 'Cravatar 标志';
-
- return $avatar_defaults;
- }
-
- /**
- * 替换个人资料卡中的头像上传地址
- */
- function set_user_profile_picture_for_cravatar() {
- return '您可以在 Cravatar 修改您的资料图片';
- }
-
- add_filter( 'user_profile_picture_description', 'set_user_profile_picture_for_cravatar' );
- add_filter( 'avatar_defaults', 'set_defaults_for_cravatar', 1 );
- add_filter( 'um_user_avatar_url_filter', 'get_cravatar_url', 1 );
- add_filter( 'bp_gravatar_url', 'get_cravatar_url', 1 );
- add_filter( 'get_avatar_url', 'get_cravatar_url', 1 );
- }
- }
- }
-
- public function field_wpapi_cb() {
- $wpapi = get_option( 'wpapi' );
- ?>
-
-
-
-
- 官方应用市场加速镜像：直接从官方反代并在大陆分发，除了增加对 WP-China-Yes 插件的更新支持外未做任何更改
-
-
- LitePress 应用市场：该接口处于开发阶段，目前提供了与 LitePress
- 翻译平台 的整合（注意，你可能在使用此接口时遇到未知 BUG，希望能帮忙 反馈）
-
- field_cb( 'super_admin', '将WordPress核心所依赖的静态文件切换为公共资源，此选项极大的加快管理后台访问速度', true );
- }
-
- public function field_super_gravatar_cb() {
- $this->field_cb( 'super_gravatar', 'Cravatar 是 Gravatar 在中国的完美替代方案，你可以在 https://cravatar.cn 更新你的头像。（任何开发者均可在自己的产品中集成该服务）' );
- }
-
- public function field_super_googlefonts_cb() {
- $this->field_cb( 'super_googlefonts', '请只在包含谷歌字体的情况下才启用该选项，以免造成不必要的性能损失' );
- }
-
- public function field_super_googleajax_cb() {
- $this->field_cb( 'super_googleajax', '请只在包含谷歌前端公共库的情况下才启用该选项，以免造成不必要的性能损失' );
- }
-
- public function options_page_html() {
- if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
- update_option( "wpapi", sanitize_text_field( $_POST['wpapi'] ) );
- update_option( "super_admin", sanitize_text_field( $_POST['super_admin'] ) );
- update_option( "super_gravatar", sanitize_text_field( $_POST['super_gravatar'] ) );
- update_option( "super_googlefonts", sanitize_text_field( $_POST['super_googlefonts'] ) );
- update_option( "super_googleajax", sanitize_text_field( $_POST['super_googleajax'] ) );
-
- echo '';
- }
-
- if ( ! current_user_can( 'manage_options' ) ) {
- return;
- }
-
- settings_errors( 'wpcy_messages' );
- ?>
-
-
-
-
-
- LitePress社区的使命是帮助WordPress在中国建立起良好的本土生态环境，以求推进行业整体发展，做大市场蛋糕。
- 特别感谢知更鸟、薇晓朵团队、AppNode在项目萌芽期给予的帮助。
- 项目所需服务器资源由硅云和又拍云提供。
-
-
-
-
-
-
-
-
-
-
- init();
-}
+new Plugin();
From 646c032e70648bf1fb12adbca6e060a0b031fc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Fri, 8 Mar 2024 21:48:15 +0800
Subject: [PATCH 06/54] =?UTF-8?q?feat:=20=E8=8A=82=E7=82=B9=E5=8F=AF?=
=?UTF-8?q?=E7=94=A8=E6=80=A7=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Base.php | 2 +
Service/Monitor.php | 156 ++++++++++++++++++++++++++++++++++++++++++++
Service/Setting.php | 24 +++----
Service/Super.php | 14 +---
composer.json | 5 +-
helpers.php | 20 ++++++
6 files changed, 195 insertions(+), 26 deletions(-)
create mode 100644 Service/Monitor.php
create mode 100644 helpers.php
diff --git a/Service/Base.php b/Service/Base.php
index 03bbf19..d1dd9e5 100644
--- a/Service/Base.php
+++ b/Service/Base.php
@@ -23,6 +23,8 @@ class Base {
// 加速服务
new Super();
+ // 监控服务
+ new Monitor();
// 更新服务
new Update();
}
diff --git a/Service/Monitor.php b/Service/Monitor.php
new file mode 100644
index 0000000..a147a36
--- /dev/null
+++ b/Service/Monitor.php
@@ -0,0 +1,156 @@
+settings = get_settings();
+
+ add_action( 'init', [ $this, 'init' ] );
+ add_action( 'wp_china_yes_maybe_check_store', [
+ $this,
+ 'maybe_check_store'
+ ] );
+ add_action( 'wp_china_yes_maybe_check_cravatar', [
+ $this,
+ 'maybe_check_cravatar'
+ ] );
+ add_action( 'wp_china_yes_maybe_check_admincdn', [
+ $this,
+ 'maybe_check_admincdn'
+ ] );
+ }
+
+ /**
+ * 初始化
+ */
+ public function init() {
+ // 检查应用市场可用性
+ if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_store' ) && $this->settings['store'] != 'off' ) {
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_store' );
+ }
+ // 检查初认头像可用性
+ if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_cravatar' ) && $this->settings['cravatar'] != 'off' ) {
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_cravatar' );
+ }
+ // 检查萌芽加速可用性
+ if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_admincdn' ) && ! empty( $this->settings['admincdn'] ) ) {
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_admincdn' );
+ }
+ }
+
+ /**
+ * 检查应用市场可用性
+ */
+ public function maybe_check_store() {
+ $test_url = 'https://api.wenpai.org/china-yes/version-check';
+ if ( $this->settings['store'] == 'proxy' ) {
+ $test_url = 'http://wpa.cdn.haozi.net/core/version-check/1.7/';
+ }
+ $response = wp_remote_get( $test_url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ if ( $this->settings['store'] == 'wenpai' ) {
+ $this->settings['store'] = 'proxy';
+ } elseif ( $this->settings['store'] == 'proxy' ) {
+ $this->settings['store'] = 'off';
+ }
+ $this->update_settings();
+ }
+ }
+
+ /**
+ * 检查初认头像可用性
+ */
+ public function maybe_check_cravatar() {
+ $test_url = 'https://cn.cravatar.com/avatar/';
+ switch ( $this->settings['cravatar'] ) {
+ case 'global':
+ $test_url = 'https://en.cravatar.com/avatar/';
+ break;
+ case 'weavatar':
+ $test_url = 'https://weavatar.com/avatar/';
+ break;
+ }
+ $response = wp_remote_get( $test_url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ if ( $this->settings['cravatar'] == 'cn' ) {
+ $this->settings['cravatar'] = 'global';
+ } elseif ( $this->settings['cravatar'] == 'global' ) {
+ $this->settings['cravatar'] = 'weavatar';
+ } elseif ( $this->settings['cravatar'] == 'weavatar' ) {
+ $this->settings['cravatar'] = 'cn';
+ }
+ $this->update_settings();
+ }
+ }
+
+ /**
+ * 检查萌芽加速可用性
+ */
+ public function maybe_check_admincdn() {
+ // 后台加速
+ if ( ! empty( $this->settings['admincdn']['admin'] ) ) {
+ $response = wp_remote_get( 'https://wpstatic.admincdn.com/6.4.3/wp-includes/js/wp-sanitize.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['admin'] );
+ $this->update_settings();
+ }
+ }
+ // 前台加速
+ if ( ! empty( $this->settings['admincdn']['frontend'] ) ) {
+ $url = network_site_url( '/wp-includes/js/wp-sanitize.min.js' );
+ $response = wp_remote_get( 'https://public.admincdn.com/' . $url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['frontend'] );
+ $this->update_settings();
+ }
+ }
+ // Google 字体
+ if ( ! empty( $this->settings['admincdn']['googlefonts'] ) ) {
+ $response = wp_remote_get( 'https://googlefonts.admincdn.com/css?family=Roboto:400,700' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['googlefonts'] );
+ $this->update_settings();
+ }
+ }
+ // Google 前端公共库
+ if ( ! empty( $this->settings['admincdn']['googleajax'] ) ) {
+ $response = wp_remote_get( 'https://googleajax.admincdn.com/ajax/libs/jquery/3.5.1/jquery.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['googleajax'] );
+ $this->update_settings();
+ }
+ }
+ // CDNJS 前端公共库
+ if ( ! empty( $this->settings['admincdn']['cdnjs'] ) ) {
+ $response = wp_remote_get( 'https://cdnjs.admincdn.com/jquery/3.5.1/jquery.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['cdnjs'] );
+ $this->update_settings();
+ }
+ }
+ }
+
+ /**
+ * 更新设置
+ */
+ private function update_settings() {
+ if ( is_multisite() ) {
+ update_site_option( 'wp_china_yes', $this->settings );
+ } else {
+ update_option( 'wp_china_yes', $this->settings );
+ }
+ }
+}
diff --git a/Service/Setting.php b/Service/Setting.php
index 7b13d7f..ded015a 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -37,20 +37,20 @@ class Setting {
[
'name' => 'store',
'label' => __( '应用市场', 'wp-china-yes' ),
- 'desc' => __( '官方加速源(WPMirror)：直接从 .org 反代至大陆分发；文派存储库：中国境内自建托管仓库，同时集成文派集市产品更新。',
+ 'desc' => __( '官方加速源（WPMirror）直接从 .org 反代至大陆分发；文派开源（WenPai.org）中国境内自建托管仓库，同时集成文派翻译平台。',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'wenpai',
'options' => [
'proxy' => '官方镜像',
- 'wenpai' => '文派中国',
+ 'wenpai' => '文派开源',
'off' => '不启用'
]
],
[
'name' => 'admincdn',
'label' => __( '萌芽加速', 'wp-china-yes' ),
- 'desc' => __( '萌芽加速(adminCDN)：将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需要加速的项目，更多细节控制和功能，请关注 adminCDN 项目。',
+ 'desc' => __( '萌芽加速（adminCDN）将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需要加速的项目，更多细节控制和功能，请关注 adminCDN 项目。',
'wp-china-yes' ),
'type' => 'multicheck',
'default' => [
@@ -67,21 +67,21 @@ class Setting {
[
'name' => 'cravatar',
'label' => __( '初认头像', 'wp-china-yes' ),
- 'desc' => __( '初认头像(Cravatar)：是 Gravatar 在中国的完美替代方案，您可以在 https://cravatar.com 上传头像，更多选项请安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 WordPress）',
+ 'desc' => __( '初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 https://cravatar.com 上传头像，更多选项请安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 WordPress）',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'cn',
'options' => [
- 'cn' => '全局启用',
+ 'cn' => '默认线路',
'global' => '国际线路',
- 'weavatar' => '备用源',
+ 'weavatar' => '备用源（WeAvatar）',
'off' => '不启用'
]
],
[
'name' => 'windfonts',
'label' => __( '文风字体', 'wp-china-yes' ),
- 'desc' => __( '文风字体(Windfonts)：即将为您的网页渲染中文字体并对主题、插件内的 Google 字体进行加速。',
+ 'desc' => __( '文风字体（Windfonts）即将为您的网页渲染中文字体并对主题、插件内的字体进行加速。',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'off',
@@ -92,7 +92,7 @@ class Setting {
[
'name' => 'adblock',
'label' => __( '广告拦截', 'wp-china-yes' ),
- 'desc' => __( '文派叶子🍃(WP-China-Yes)：独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，查看可优化插件列表。',
+ 'desc' => __( '文派叶子🍃（WP-China-Yes）独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，查看可优化插件列表。',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'off',
@@ -169,7 +169,7 @@ class Setting {
.card h3 {
margin-top: 0;
}
- .card a {
+ .card a, .left-column a {
text-decoration: none;
}
.card-body, .card-footer {
@@ -221,8 +221,6 @@ HTML;
了解更多
赞助商
@@ -240,8 +238,6 @@ HTML;
成为赞助商
-
-
建站套件
@@ -259,7 +255,7 @@ HTML;
-提示：此处选项设置并不与任何文派插件及独立功能扩展冲突，可放心安装启用。
+提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可在此页面重新设置。
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
HTML;
diff --git a/Service/Super.php b/Service/Super.php
index b2962b7..fc55de4 100644
--- a/Service/Super.php
+++ b/Service/Super.php
@@ -4,6 +4,8 @@ namespace WenPai\ChinaYes\Service;
defined( 'ABSPATH' ) || exit;
+use function WenPai\ChinaYes\get_settings;
+
/**
* Class Super
* 插件加速服务
@@ -12,19 +14,9 @@ defined( 'ABSPATH' ) || exit;
class Super {
private $settings;
- private $default = [
- 'store' => 'wenpai',
- 'admincdn' => [
- 'admin' => 'admin',
- ],
- 'cravatar' => 'cn',
- 'windfonts' => 'off',
- 'adblock' => 'off',
- ];
public function __construct() {
- $this->settings = is_multisite() ? get_site_option( 'wp_china_yes' ) : get_option( 'wp_china_yes' );
- $this->settings = wp_parse_args( $this->settings, $this->default );
+ $this->settings = get_settings();
/**
* WordPress.Org API 替换
diff --git a/composer.json b/composer.json
index c1e9b4d..8f816bf 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,10 @@
"autoload": {
"psr-4": {
"WenPai\\ChinaYes\\": "./"
- }
+ },
+ "files": [
+ "helpers.php"
+ ]
},
"authors": [
{
diff --git a/helpers.php b/helpers.php
new file mode 100644
index 0000000..e3e545d
--- /dev/null
+++ b/helpers.php
@@ -0,0 +1,20 @@
+ 'wenpai',
+ 'admincdn' => [
+ 'admin' => 'admin',
+ ],
+ 'cravatar' => 'cn',
+ 'windfonts' => 'off',
+ 'adblock' => 'off',
+ ] );
+}
From 41c27fe48701359e43ae6b3a092fcf34634c55c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Fri, 8 Mar 2024 22:04:26 +0800
Subject: [PATCH 07/54] workflow: fix CI branch
---
.github/workflows/update-changelog.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 07e3c7d..df49076 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,7 +15,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
with:
- ref: main
+ ref: master
- name: Update Changelog
uses: stefanzweifel/changelog-updater-action@v1
@@ -26,6 +26,6 @@ jobs:
- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v5
with:
- branch: main
+ branch: master
commit_message: "docs: Update CHANGELOG"
file_pattern: CHANGELOG.md
From b255b869474e2d22c084ad1752b9032b800cabad Mon Sep 17 00:00:00 2001
From: devhaozi
Date: Fri, 8 Mar 2024 14:07:09 +0000
Subject: [PATCH 08/54] docs: Update CHANGELOG
---
CHANGELOG.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d8a8f3..a02b6ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,3 +2,12 @@
All notable changes to `WP-China-Yes` will be documented in this file.
+## v3.6.1 - 2024-03-08
+
+1. 重构全部代码
+2. 应用市场调整为[文派开源](https://wenpai.org)
+3. 加速服务调整为[萌芽加速](https://admincdn.com)
+4. 头像调整为[初认头像](https://cravatar.com)
+5. 支持自动检测节点可用性
+
+**Full Changelog**: https://github.com/WenPai-org/wp-china-yes/compare/V3.5.5...v3.6.1
From 597c0943d5e47fb01e34dcfaa4ea50ff9ebac521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
<130886204+modiqi@users.noreply.github.com>
Date: Sat, 9 Mar 2024 00:39:13 +0800
Subject: [PATCH 09/54] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE=20UI?=
=?UTF-8?q?=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
更新叶子插件设置界面样式
---
Service/Setting.php | 173 ++++++++++++++++++++++++++++----------------
1 file changed, 112 insertions(+), 61 deletions(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index ded015a..c997e92 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -139,70 +139,119 @@ class Setting {
* 设置页面模版
*/
public function setting_page() {
- echo 'WP-China-Yes
';
- echo '将您的 WordPress 接入本土生态体系，这将为您提供一个更贴近中国人使用习惯的 WordPress。
100% 开源代码，一起参与文派（WordPress）软件国产化进程，打造属于您自己的开源自助建站程序。
';
+ echo '';
echo <<
- .container {
- display: flex;
- flex-wrap: wrap;
- width: 100%;
- }
- .left-column, .right-column {
- width: 100%;
- }
- .left-column {
- background-color: #f0f0f0;
- }
- .right-column {
- padding: 20px;
- display: flex;
- flex-direction: column;
- gap: 20px;
- }
- .card {
- background-color: #fff;
- padding: 20px;
- box-shadow: 0 1px 3px rgba(0,0,0,0.13);
- border-radius: 4px;
- }
- .card h3 {
- margin-top: 0;
- }
- .card a, .left-column a {
- text-decoration: none;
- }
- .card-body, .card-footer {
- margin: 10px 0;
- }
-
- .sponsor-logos {
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
- }
+
+ .wpcy-settings-footer p {
+ font-size: x-small;
+ line-height: 2;
+ }
+ .sponsor-logos {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ }
+
+ .sponsor-logos img {
+ width: 26%;
+ margin-bottom: 30px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ height: fit-content;
+ }
+
+ @media screen and (max-width: 782px){
+ .auto-fold #wpcontent {
+ padding: 10px;
+ }
+ }
+ @media (min-width: 768px) {
+ .container {
+ flex-wrap: nowrap;
+ max-width: 1280px;
+ margin: 0 auto;
+ }
+ .left-column {
+ width: 70%;
+ }
+ .right-column {
+ width: 30%;
+ }
+ }
+
HTML;
@@ -210,6 +259,10 @@ HTML;
$this->setting_api->show_forms();
echo <<
+
提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可在此页面重新设置。
+
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
+
@@ -255,8 +308,6 @@ HTML;
-提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可在此页面重新设置。
-帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
HTML;
}
From 2223b022b76c10f26dbf02ea7160f3b14a4c0168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Sat, 9 Mar 2024 01:40:34 +0800
Subject: [PATCH 10/54] =?UTF-8?q?fix:=20=E5=B8=82=E5=9C=BA=E5=8A=A0?=
=?UTF-8?q?=E9=80=9F=E5=AF=BC=E8=87=B4=20Beta=20=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Plugin.php | 2 +-
Service/Setting.php | 224 ++++++++++++-----------------------------
Service/Super.php | 8 +-
Service/Update.php | 3 +-
assets/css/setting.css | 120 ++++++++++++++++++++++
wp-china-yes.php | 13 +--
6 files changed, 200 insertions(+), 170 deletions(-)
create mode 100644 assets/css/setting.css
diff --git a/Plugin.php b/Plugin.php
index 1d3f726..1e5d455 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -38,7 +38,7 @@ class Plugin {
* 插件加载时执行
*/
public function plugins_loaded() {
- load_plugin_textdomain( 'wp-china-yes', false, plugin_dir_path( PLUGIN_FILE ) . 'languages' );
+ load_plugin_textdomain( 'wp-china-yes', false, CHINA_YES_PLUGIN_PATH . 'languages' );
add_action( 'admin_notices', [ $this, 'admin_notices' ] );
}
diff --git a/Service/Setting.php b/Service/Setting.php
index c997e92..32818ba 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -17,6 +17,7 @@ class Setting {
public function __construct() {
$this->setting_api = new API();
add_action( 'admin_init', [ $this, 'admin_init' ] );
+ add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_assets' ] );
add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', [ $this, 'admin_menu' ] );
}
@@ -108,6 +109,16 @@ class Setting {
$this->setting_api->admin_init();
}
+ /**
+ * 加载后台资源
+ */
+ public function enqueue_admin_assets( $hook_suffix ) {
+ if ( strpos( $hook_suffix, 'wp-china-yes' ) === false ) {
+ return;
+ }
+ wp_enqueue_style( 'wpcy-admin', CHINA_YES_PLUGIN_URL . 'assets/css/setting.css', [], CHINA_YES_VERSION );
+ }
+
/**
* 挂载设置页面
*/
@@ -139,174 +150,69 @@ class Setting {
* 设置页面模版
*/
public function setting_page() {
- echo '';
echo <<
- html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
- font-family: "Source Han Sans SC", "Noto Sans CJK SC", "Source Han Sans CN", "Noto Sans SC", "Source Han Sans TC", "Noto Sans CJK TC", sans-serif, -apple-system, "Noto Sans", "Helvetica Neue", Helvetica, "Nimbus Sans L", Arial, "Liberation Sans", "PingFang SC", "Hiragino Sans GB", "Noto Sans CJK SC", "Source Han Sans SC", "Source Han Sans CN", "Microsoft YaHei", "Wenquanyi Micro Hei", "WenQuanYi Zen Hei", "ST Heiti", SimHei, "WenQuanYi Zen Hei Sharp", sans-serif;
-}
- #wpcontent, #wpfooter {
- background-color: #ffffff;
- }
- .container {
- display: flex;
- flex-wrap: wrap;
- width: 100%;
- }
- .left-column, .right-column {
- width: 100%;
- }
- .right-column {
- padding: 20px;
- display: flex;
- flex-direction: column;
- gap: 20px;
- }
- .card {
- background-color: #fff;
- padding: 10%;
- border-radius: 10px;
- text-transform: none;
- border: 0px solid #c3c4c7;
- font-size: 14px;
- line-height: 2;
- box-shadow: 0 0.375rem 1.5rem 0 rgba(141, 153, 165, 0.13);
- }
-
- .card h3 {
- margin-top: 0;
- font-size: 18px;
- font-weight: 400;
- }
- .card a, .left-column a {
- text-decoration: none;
- }
- .card-body, .card-footer {
- margin: 10px 0;
- }
-
- .card-footer a.button.button-primary {
- padding: 1% 5%;
- margin-top: 10px;
- }
- .form-table th {
- width: 120px;
- padding: 5% 0;
- }
- .form-table td {
- padding: 5% 0;
- }
- .wpcy-settings-header {
- padding-top: 20px;
- max-width: 1280px;
- margin: 0 auto;
- line-height: 1.5;
- }
- .wpcy-settings-title-section {
- padding: 1% 0;
- }
- .wpcy-settings-title-section h3 {
- font-size: large;
- }
- .wpcy-settings-title-section h4 {
- font-size: large;
- font-weight: 400;
- }
- .wpcy-settings-footer p {
- font-size: x-small;
- line-height: 2;
- }
- .sponsor-logos {
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
- }
-
- .sponsor-logos img {
- width: 26%;
- margin-bottom: 30px;
- display: block;
- margin-left: auto;
- margin-right: auto;
- height: fit-content;
- }
-
- @media screen and (max-width: 782px){
- .auto-fold #wpcontent {
- padding: 10px;
- }
- }
- @media (min-width: 768px) {
- .container {
- flex-wrap: nowrap;
- max-width: 1280px;
- margin: 0 auto;
- }
- .left-column {
- width: 70%;
- }
- .right-column {
- width: 30%;
- }
- }
-
+
-
+
HTML;
$this->setting_api->show_navigation();
$this->setting_api->show_forms();
echo <<
-
提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可在此页面重新设置。
-
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
-
-
-
-
-
项目简介
-
- 文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
-
-
+
-
-
赞助商
-
-
+
+
+
项目简介
+
+ 文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
+
+
+
+
+
-
-
HTML;
diff --git a/Service/Super.php b/Service/Super.php
index fc55de4..d3b0ee4 100644
--- a/Service/Super.php
+++ b/Service/Super.php
@@ -217,8 +217,10 @@ class Super {
* WordPress.Org 替换
*/
public function filter_wordpress_org( $preempt, $args, $url ) {
- if ( ( ! strpos( $url, 'api.wordpress.org' ) && ! strpos( $url,
- 'downloads.wordpress.org' ) ) ) {
+ if ( $preempt || isset( $args['_wp_china_yes'] ) ) {
+ return $preempt;
+ }
+ if ( ( ! strpos( $url, 'api.wordpress.org' ) && ! strpos( $url, 'downloads.wordpress.org' ) ) ) {
return $preempt;
}
@@ -240,6 +242,8 @@ class Super {
$url = str_replace( 'https://', 'http://', $url );
}
+ $args['_wp_china_yes'] = true;
+
return wp_remote_request( $url, $args );
}
diff --git a/Service/Update.php b/Service/Update.php
index c8a5951..daccdd7 100644
--- a/Service/Update.php
+++ b/Service/Update.php
@@ -5,7 +5,6 @@ namespace WenPai\ChinaYes\Service;
defined( 'ABSPATH' ) || exit;
use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
-use const WenPai\ChinaYes\PLUGIN_FILE;
/**
* Class Update
@@ -17,7 +16,7 @@ class Update {
public function __construct() {
PucFactory::buildUpdateChecker(
'https://api.wenpai.org/china-yes/version-check',
- PLUGIN_FILE,
+ CHINA_YES_PLUGIN_FILE,
'wp-china-yes'
);
}
diff --git a/assets/css/setting.css b/assets/css/setting.css
new file mode 100644
index 0000000..de2b0e5
--- /dev/null
+++ b/assets/css/setting.css
@@ -0,0 +1,120 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+ font-family: "Source Han Sans SC", "Noto Sans CJK SC", "Source Han Sans CN", "Noto Sans SC", "Source Han Sans TC", "Noto Sans CJK TC", sans-serif, -apple-system, "Noto Sans", "Helvetica Neue", Helvetica, "Nimbus Sans L", Arial, "Liberation Sans", "PingFang SC", "Hiragino Sans GB", "Noto Sans CJK SC", "Source Han Sans SC", "Source Han Sans CN", "Microsoft YaHei", "Wenquanyi Micro Hei", "WenQuanYi Zen Hei", "ST Heiti", SimHei, "WenQuanYi Zen Hei Sharp", sans-serif;
+}
+
+#wpcontent, #wpfooter {
+ background-color: #ffffff;
+}
+
+.notice {
+ background-color: #f5f5f5;
+}
+
+.container {
+ display: flex;
+ flex-wrap: wrap;
+ width: 100%;
+}
+
+.left-column, .right-column {
+ width: 100%;
+}
+
+.right-column {
+ padding: 20px;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+}
+
+.card {
+ background-color: #fff;
+ padding: 10%;
+ border-radius: 10px;
+ text-transform: none;
+ border: 0px solid #c3c4c7;
+ font-size: 14px;
+ line-height: 2;
+ box-shadow: 0 0.375rem 1.5rem 0 rgba(141, 153, 165, 0.13);
+}
+
+.card h3 {
+ margin-top: 0;
+ font-size: 18px;
+ font-weight: 400;
+}
+
+.card a, .left-column a {
+ text-decoration: none;
+}
+
+.card-body, .card-footer {
+ margin: 10px 0;
+}
+
+.card-footer a.button.button-primary {
+ padding: 1% 5%;
+ margin-top: 10px;
+}
+
+.form-table th {
+ width: 120px;
+ padding: 5% 0;
+}
+
+.form-table td {
+ padding: 5% 0;
+}
+
+.settings-header {
+ padding-top: 20px;
+ max-width: 1280px;
+ margin: 0 auto;
+ line-height: 1.5;
+}
+
+.settings-title-section {
+ padding: 1% 0;
+}
+
+.settings-footer p {
+ font-size: 12px;
+ line-height: 2;
+}
+
+.sponsor-logos {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+}
+
+.sponsor-logos img {
+ width: 26%;
+ margin-bottom: 30px;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ height: fit-content;
+}
+
+@media screen and (max-width: 782px) {
+ .auto-fold #wpcontent {
+ padding: 10px;
+ }
+}
+
+@media (min-width: 768px) {
+ .container {
+ flex-wrap: nowrap;
+ max-width: 1280px;
+ margin: 0 auto;
+ }
+
+ .left-column {
+ width: 70%;
+ }
+
+ .right-column {
+ width: 30%;
+ }
+}
\ No newline at end of file
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 3752e6d..54094cc 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -19,15 +19,16 @@ namespace WenPai\ChinaYes;
defined( 'ABSPATH' ) || exit;
-const VERSION = '3.6.1';
-const PLUGIN_FILE = __FILE__;
-const PLUGIN_DIR = __DIR__;
+define( 'CHINA_YES_VERSION', '3.6.1' );
+define( 'CHINA_YES_PLUGIN_FILE', __FILE__ );
+define( 'CHINA_YES_PLUGIN_URL', plugin_dir_url( CHINA_YES_PLUGIN_FILE ) );
+define( 'CHINA_YES_PLUGIN_PATH', plugin_dir_path( CHINA_YES_PLUGIN_FILE ) );
-require_once( plugin_dir_path( __FILE__ ) . 'vendor/autoload.php' );
+require_once( plugin_dir_path( CHINA_YES_PLUGIN_FILE ) . 'vendor/autoload.php' );
// 注册插件激活钩子
-register_activation_hook( PLUGIN_FILE, [ Plugin::class, 'activate' ] );
+register_activation_hook( CHINA_YES_PLUGIN_FILE, [ Plugin::class, 'activate' ] );
// 注册插件删除钩子
-register_uninstall_hook( PLUGIN_FILE, [ Plugin::class, 'uninstall' ] );
+register_uninstall_hook( CHINA_YES_PLUGIN_FILE, [ Plugin::class, 'uninstall' ] );
new Plugin();
From cd8e420e81d2504e2d444d5ffc409413e501b01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Sat, 9 Mar 2024 03:53:48 +0800
Subject: [PATCH 11/54] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Monitor.php | 4 ++--
Service/Setting.php | 2 +-
Service/Super.php | 6 +++---
Service/Update.php | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Service/Monitor.php b/Service/Monitor.php
index a147a36..d80b9f3 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -55,9 +55,9 @@ class Monitor {
* 检查应用市场可用性
*/
public function maybe_check_store() {
- $test_url = 'https://api.wenpai.org/china-yes/version-check';
+ $test_url = 'https://api.wenpai.net/china-yes/version-check';
if ( $this->settings['store'] == 'proxy' ) {
- $test_url = 'http://wpa.cdn.haozi.net/core/version-check/1.7/';
+ $test_url = 'https://api.wpmirror.com/core/version-check/1.7/';
}
$response = wp_remote_get( $test_url );
if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
diff --git a/Service/Setting.php b/Service/Setting.php
index 32818ba..588d1bb 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -153,7 +153,7 @@ class Setting {
echo <<
-
文派叶子🍃(WP-China-Yes)
+ 文派叶子🍃（WP-China-Yes）
将您的 WordPress 接入本土生态体系，这将为您提供一个更贴近中国人使用习惯的 WordPress。
100% 开源代码，一起参与文派（WordPress）软件国产化进程，打造属于您自己的开源自助建站程序。
diff --git a/Service/Super.php b/Service/Super.php
index d3b0ee4..d103155 100644
--- a/Service/Super.php
+++ b/Service/Super.php
@@ -225,11 +225,11 @@ class Super {
}
if ( $this->settings['store'] == 'wenpai' ) {
- $url = str_replace( 'api.wordpress.org', 'api.wenpai.org', $url );
+ $url = str_replace( 'api.wordpress.org', 'api.wenpai.net', $url );
} else {
- $url = str_replace( 'api.wordpress.org', 'wpa.cdn.haozi.net', $url );
+ $url = str_replace( 'api.wordpress.org', 'api.wpmirror.com', $url );
}
- $url = str_replace( 'downloads.wordpress.org', 'wpd.cdn.haozi.net', $url );
+ $url = str_replace( 'downloads.wordpress.org', 'downloads.wenpai.net', $url );
$curl_version = '1.0.0';
if ( function_exists( 'curl_version' ) ) {
diff --git a/Service/Update.php b/Service/Update.php
index daccdd7..e102b82 100644
--- a/Service/Update.php
+++ b/Service/Update.php
@@ -15,7 +15,7 @@ class Update {
public function __construct() {
PucFactory::buildUpdateChecker(
- 'https://api.wenpai.org/china-yes/version-check',
+ 'https://api.wenpai.net/china-yes/version-check',
CHINA_YES_PLUGIN_FILE,
'wp-china-yes'
);
From 7d38bc7adc8abfb7592856e9b5bdd66c8698ed9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
<130886204+modiqi@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:57:44 +0800
Subject: [PATCH 12/54] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20UI=20=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
调整字体大小
---
Service/Setting.php | 2 +-
assets/css/setting.css | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index 588d1bb..aed8de9 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -68,7 +68,7 @@ class Setting {
[
'name' => 'cravatar',
'label' => __( '初认头像', 'wp-china-yes' ),
- 'desc' => __( '初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 https://cravatar.com 上传头像，更多选项请安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 WordPress）',
+ 'desc' => __( '初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 Cravatar.com 上传头像，更多选项请安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 WordPress）',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'cn',
diff --git a/assets/css/setting.css b/assets/css/setting.css
index de2b0e5..5a1bfdb 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -5,7 +5,9 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
#wpcontent, #wpfooter {
background-color: #ffffff;
}
-
+#wpbody-content {
+ padding-bottom: 10%;
+}
.notice {
background-color: #f5f5f5;
}
@@ -72,6 +74,10 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
margin: 0 auto;
line-height: 1.5;
}
+.settings-header .update-messages h2, .update-php h2, h4 {
+ font-size: 15px;
+ font-weight: 400;
+}
.settings-title-section {
padding: 1% 0;
From 2c86b5c546acb16a1398dec3b3b24211af118f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Sat, 9 Mar 2024 18:23:41 +0800
Subject: [PATCH 13/54] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=20URL=20=E5=8F=8A=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Monitor.php | 4 ++--
assets/css/setting.css | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Service/Monitor.php b/Service/Monitor.php
index d80b9f3..c244f9b 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -127,7 +127,7 @@ class Monitor {
}
// Google 前端公共库
if ( ! empty( $this->settings['admincdn']['googleajax'] ) ) {
- $response = wp_remote_get( 'https://googleajax.admincdn.com/ajax/libs/jquery/3.5.1/jquery.min.js' );
+ $response = wp_remote_get( 'https://googleajax.admincdn.com/ajax/libs/jquery/3.7.1/jquery.slim.min.js' );
if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
unset( $this->settings['admincdn']['googleajax'] );
$this->update_settings();
@@ -135,7 +135,7 @@ class Monitor {
}
// CDNJS 前端公共库
if ( ! empty( $this->settings['admincdn']['cdnjs'] ) ) {
- $response = wp_remote_get( 'https://cdnjs.admincdn.com/jquery/3.5.1/jquery.min.js' );
+ $response = wp_remote_get( 'https://cdnjs.admincdn.com/jquery/3.7.1/jquery.slim.min.js' );
if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
unset( $this->settings['admincdn']['cdnjs'] );
$this->update_settings();
diff --git a/assets/css/setting.css b/assets/css/setting.css
index 5a1bfdb..99975fb 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -5,9 +5,11 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
#wpcontent, #wpfooter {
background-color: #ffffff;
}
+
#wpbody-content {
padding-bottom: 10%;
}
+
.notice {
background-color: #f5f5f5;
}
@@ -74,6 +76,7 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
margin: 0 auto;
line-height: 1.5;
}
+
.settings-header .update-messages h2, .update-php h2, h4 {
font-size: 15px;
font-weight: 400;
@@ -123,4 +126,4 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
.right-column {
width: 30%;
}
-}
\ No newline at end of file
+}
From c947537af6b687b090456227539a080fbaa26ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Sat, 9 Mar 2024 19:36:59 +0800
Subject: [PATCH 14/54] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=20v3.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
wp-china-yes.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 54094cc..fe0b3e5 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -4,7 +4,7 @@
* Description: 文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，生生不息。
* Author: 文派开源
* Author URI: https://wp-china-yes.com
- * Version: 3.6.1
+ * Version: 3.6.2
* License: GPLv3 or later
* Text Domain: wp-china-yes
* Domain Path: /languages
@@ -19,7 +19,7 @@ namespace WenPai\ChinaYes;
defined( 'ABSPATH' ) || exit;
-define( 'CHINA_YES_VERSION', '3.6.1' );
+define( 'CHINA_YES_VERSION', '3.6.2' );
define( 'CHINA_YES_PLUGIN_FILE', __FILE__ );
define( 'CHINA_YES_PLUGIN_URL', plugin_dir_url( CHINA_YES_PLUGIN_FILE ) );
define( 'CHINA_YES_PLUGIN_PATH', plugin_dir_path( CHINA_YES_PLUGIN_FILE ) );
From ce026464632dc0565dc938b5404daf873b398815 Mon Sep 17 00:00:00 2001
From: devhaozi
Date: Sat, 9 Mar 2024 11:41:25 +0000
Subject: [PATCH 15/54] docs: Update CHANGELOG
---
CHANGELOG.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a02b6ad..f9b7bdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
All notable changes to `WP-China-Yes` will be documented in this file.
+## v3.6.2 - 2024-03-09
+
+1. UI 重构
+2. 修复市场加速导致 Beta 测试插件失效的问题
+3. 更新接口及测试 URL
+
+**Full Changelog**: https://github.com/WenPai-org/wp-china-yes/compare/v3.6.1...v3.6.2
+
## v3.6.1 - 2024-03-08
1. 重构全部代码
From 4a7c871c5cf2fe9f3a27c5c45166af846b5020d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Fri, 23 Aug 2024 14:45:34 +0800
Subject: [PATCH 16/54] feat: bump version 3.6.3
---
Plugin.php | 2 +-
Service/Monitor.php | 11 +++++++++++
Service/Setting.php | 24 +++++++++++++++++++-----
Service/Super.php | 19 +++++++++++++++++++
assets/css/fonts.css | 3 +++
assets/css/setting.css | 2 +-
helpers.php | 1 +
wp-china-yes.php | 4 ++--
8 files changed, 57 insertions(+), 9 deletions(-)
create mode 100644 assets/css/fonts.css
diff --git a/Plugin.php b/Plugin.php
index 1e5d455..3d74313 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -10,7 +10,7 @@ use WenPai\ChinaYes\Service\Setting;
class Plugin {
/**
- * 创建一个插件实例
+ * 创建插件实例
*/
public function __construct() {
new Base();
diff --git a/Service/Monitor.php b/Service/Monitor.php
index c244f9b..1f867f7 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -37,6 +37,9 @@ class Monitor {
* 初始化
*/
public function init() {
+ if ( $this->settings['monitor'] != 'on' ) {
+ return;
+ }
// 检查应用市场可用性
if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_store' ) && $this->settings['store'] != 'off' ) {
wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_store' );
@@ -141,6 +144,14 @@ class Monitor {
$this->update_settings();
}
}
+ // jsDelivr 公共库
+ if ( ! empty( $this->settings['admincdn']['jsdelivr'] ) ) {
+ $response = wp_remote_get( 'https://jsd.admincdn.com/npm/jquery@3.7.1/dist/jquery.slim.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ unset( $this->settings['admincdn']['jsdelivr'] );
+ $this->update_settings();
+ }
+ }
}
/**
diff --git a/Service/Setting.php b/Service/Setting.php
index aed8de9..c64c782 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -62,7 +62,8 @@ class Setting {
'frontend' => '前台加速',
'googlefonts' => 'Google 字体',
'googleajax' => 'Google 前端公共库',
- 'cdnjs' => 'CDNJS 前端公共库'
+ 'cdnjs' => 'CDNJS 前端公共库',
+ 'jsdelivr' => 'jsDelivr 公共库',
]
],
[
@@ -75,19 +76,20 @@ class Setting {
'options' => [
'cn' => '默认线路',
'global' => '国际线路',
- 'weavatar' => '备用源（WeAvatar）',
+ 'weavatar' => '备用源（WeAvatar）',
'off' => '不启用'
]
],
[
'name' => 'windfonts',
'label' => __( '文风字体', 'wp-china-yes' ),
- 'desc' => __( '文风字体（Windfonts）即将为您的网页渲染中文字体并对主题、插件内的字体进行加速。',
+ 'desc' => __( '文风字体（Windfonts）为您的网页渲染中文字体并对主题、插件内的字体进行加速；优化模式可优化浏览器字体调用。',
'wp-china-yes' ),
'type' => 'radio',
'default' => 'off',
'options' => [
- 'off' => '即将上线',
+ 'optimize' => '优化模式',
+ 'off' => '不启用',
]
],
[
@@ -101,6 +103,18 @@ class Setting {
'off' => '即将上线',
]
],
+ [
+ 'name' => 'monitor',
+ 'label' => __( '自动监控', 'wp-china-yes' ),
+ 'desc' => __( '文派叶子🍃（WP-China-Yes）支持自动监控各加速节点可用性，当节点不可用时自动切换至可用节点或关闭加速，以保证您的网站正常访问。',
+ 'wp-china-yes' ),
+ 'type' => 'radio',
+ 'default' => 'on',
+ 'options' => [
+ 'on' => '启用',
+ 'off' => '不启用',
+ ]
+ ],
]
];
@@ -166,7 +180,7 @@ HTML;
echo <<
- 提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可在此页面重新设置。
+ 提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可重新设置或关闭自动监控功能。
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
+
+
+
+
+
+
+
+HTML,
+ ],
+ [
+ 'type' => 'subheading',
+ 'content' => '开发者 & 贡献者',
+ ],
+ [
+ 'type' => 'content',
+ 'content' =>
+ <<孙锡源 |
+耗子 |
+Yulinn |
+赵丰 |
+jialong Dong |
+TigerKK |
+xianyu125 |
+ElliotHughes |
+诗语 |
+莫蒂奇 |
+薇晓朵
+HTML,
+ ]
+ ],
+ ] );
}
/**
@@ -137,15 +398,6 @@ class Setting {
* 挂载设置页面
*/
public function admin_menu() {
- // 后台设置
- add_submenu_page(
- is_multisite() ? 'settings.php' : 'options-general.php',
- esc_html__( 'WP-China-Yes', 'wp-china-yes' ),
- esc_html__( 'WP-China-Yes', 'wp-china-yes' ),
- is_multisite() ? 'manage_network_options' : 'manage_options',
- 'wp-china-yes',
- [ $this, 'setting_page' ]
- );
// 插件页设置
add_filter( 'plugin_action_links', function ( $links, $file ) {
if ( 'wp-china-yes/wp-china-yes.php' !== $file ) {
@@ -159,76 +411,4 @@ class Setting {
return $links;
}, 10, 2 );
}
-
- /**
- * 设置页面模版
- */
- public function setting_page() {
- echo <<
-
-
文派叶子🍃（WP-China-Yes）
-
- 将您的 WordPress 接入本土生态体系，这将为您提供一个更贴近中国人使用习惯的 WordPress。
- 100% 开源代码，一起参与文派（WordPress）软件国产化进程，打造属于您自己的开源自助建站程序。
-
-
-
-HTML;
- $this->setting_api->show_navigation();
- $this->setting_api->show_forms();
-
- echo <<
-
提示：插件会定期检查节点可用性，并在节点不可用时自动切换至可用节点，以保证您的网站正常访问。如您发现设置项被自动切换，可重新设置或关闭自动监控功能。
-
帮助：您可以随时在此处调整个性化设置以便适应不同的业务场景，萌新请保持默认即可。此项目的发展离不开您的支持和建议，查看联系方式。
-
-
-
-
项目简介
-
- 文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
HTML,
],
From cb06d1bef4bcd3b1396036f1c758ec45aea4fa9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
<130886204+modiqi@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:18:23 +0800
Subject: [PATCH 28/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E8=89=B2=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/setting.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/css/setting.css b/assets/css/setting.css
index 162a105..45e2a80 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -12,7 +12,7 @@
}
.wp_china_yes-content a {
- color: #0073aa;
+ color: #3858e9;
text-decoration: none;
}
From 219631bc7e55b3f76792d5023abb328922234c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
<130886204+modiqi@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:01:11 +0800
Subject: [PATCH 29/54] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8Fcss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/fonts.css | 6 +++++-
assets/css/setting.css | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
index 5b0941e..86bde42 100644
--- a/assets/css/fonts.css
+++ b/assets/css/fonts.css
@@ -1,3 +1,7 @@
+html {
+ -webkit-font-smoothing: antialiased;
+}
+
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
font-family: -apple-system, "Noto Sans", "Helvetica Neue", Helvetica, "Nimbus Sans L", Arial, "Liberation Sans", "PingFang SC", "Hiragino Sans GB", "Noto Sans CJK SC", "Source Han Sans SC", "Source Han Sans CN", "Microsoft YaHei", "Wenquanyi Micro Hei", "WenQuanYi Zen Hei", "ST Heiti", SimHei, "WenQuanYi Zen Hei Sharp", sans-serif;
-}
\ No newline at end of file
+}
diff --git a/assets/css/setting.css b/assets/css/setting.css
index 45e2a80..96cb79c 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -16,6 +16,10 @@
text-decoration: none;
}
+.wp_china_yes-content a:active, a:focus, a:hover {
+ color: #2c3338;
+}
+
.wp_china_yes-options {
background-color: #fff;
padding: 1%;
From b0a4bc3d420d788b6bfdf0d7bedb7e7ffdcf0da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
<130886204+modiqi@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:25:17 +0800
Subject: [PATCH 30/54] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Setting.php | 4 +++-
assets/css/setting.css | 13 ++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index f85de8c..7984f60 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -308,7 +308,7 @@ class Setting {
'type' => 'text',
'title' => '品牌白标',
'subtitle' => '自定义插件显示品牌名',
- 'desc' => __( '专为 WordPress 建站服务商和代理机构提供的自定义品牌 OEM 功能，输入您的品牌词启用后生效',
+ 'desc' => __( '专为 WordPress 建站服务商和代理机构提供的自定义品牌 OEM 功能，输入您的品牌词启用后生效',
'wp-china-yes' ),
'default' => "WP-China-Yes",
],
@@ -377,6 +377,7 @@ HTML,
'type' => 'content',
'content' =>
<<
孙锡源 |
耗子 |
Yulinn |
@@ -388,6 +389,7 @@ HTML,
诗语 |
莫蒂奇 |
薇晓朵
+
HTML,
]
],
diff --git a/assets/css/setting.css b/assets/css/setting.css
index 96cb79c..a9ebcba 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -7,10 +7,21 @@
.sponsor-logos img {
flex-basis: calc(20% - 10px);
max-width: 85px;
- margin: 5px;
+ margin: 14px;
height: auto;
}
+.contributors-name {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding: 12px;
+ color: #dcdcde;
+}
+
+.contributors-name a{
+ line-height: 2;
+ padding: 0.5em;
+}
.wp_china_yes-content a {
color: #3858e9;
text-decoration: none;
From a87985970d67acb112ceef9e7c24d8171c0f8a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Wed, 25 Sep 2024 16:45:48 +0800
Subject: [PATCH 31/54] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=8E=92?=
=?UTF-8?q?=E5=8D=B0=E4=BC=98=E5=8C=96=E5=92=8C=E9=A3=9E=E8=A1=8C=E6=A8=A1?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
Service/Monitor.php | 6 +-
Service/Setting.php | 98 ++++++++++-
Service/Super.php | 291 +++++++++++++++++++++++++-------
assets/css/setting.css | 3 +-
helpers.php | 23 +--
languages/wp-china-yes-en_US.mo | Bin 5870 -> 0 bytes
languages/wp-china-yes-en_US.po | 171 -------------------
languages/wp-china-yes-zh_CN.mo | Bin 5468 -> 0 bytes
languages/wp-china-yes-zh_CN.po | 160 ------------------
languages/wp-china-yes-zh_TW.mo | Bin 5492 -> 0 bytes
languages/wp-china-yes-zh_TW.po | 160 ------------------
12 files changed, 340 insertions(+), 573 deletions(-)
delete mode 100644 languages/wp-china-yes-en_US.mo
delete mode 100644 languages/wp-china-yes-en_US.po
delete mode 100644 languages/wp-china-yes-zh_CN.mo
delete mode 100644 languages/wp-china-yes-zh_CN.po
delete mode 100644 languages/wp-china-yes-zh_TW.mo
delete mode 100644 languages/wp-china-yes-zh_TW.po
diff --git a/.gitignore b/.gitignore
index 5657f6e..331c58f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+.idea
vendor
\ No newline at end of file
diff --git a/Service/Monitor.php b/Service/Monitor.php
index bcdecb4..e59aab6 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -17,6 +17,9 @@ class Monitor {
public function __construct() {
$this->settings = get_settings();
+ if ( $this->settings['monitor'] ) {
+ return;
+ }
add_action( 'init', [ $this, 'init' ] );
add_action( 'wp_china_yes_maybe_check_store', [
@@ -37,9 +40,6 @@ class Monitor {
* 初始化
*/
public function init() {
- if ( $this->settings['monitor'] ) {
- return;
- }
// 检查应用市场可用性
if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_store' ) && $this->settings['store'] != 'off' ) {
wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_store' );
diff --git a/Service/Setting.php b/Service/Setting.php
index 7984f60..9d4e8cb 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -125,6 +125,26 @@ class Setting {
'desc' => __( '文风字体（Windfonts）为您的网站增添无限活力。专为中文网页设计，旨在提升用户阅读体验和视觉享受。新手使用请先查看字体使用说明。',
'wp-china-yes' ),
],
+ [
+ 'id' => 'windfonts_typography',
+ 'type' => 'checkbox',
+ 'title' => __( '排印优化', 'wp-china-yes' ),
+ 'inline' => true,
+ 'options' => [
+ 'corner' => '直角括号',
+ 'space' => '文本空格',
+ 'punctuation' => '标点显示',
+ ],
+ 'default' => '',
+ 'subtitle' => '是否启用排印优化',
+ 'desc' => __( '排印优化可提升中文网页的视觉美感，适用于中文字体的网站。',
+ 'wp-china-yes' ),
+ 'dependency' => [
+ 'windfonts',
+ 'any',
+ 'on,frontend,optimize',
+ ],
+ ],
[
'id' => 'windfonts_list',
'type' => 'group',
@@ -193,7 +213,7 @@ class Setting {
'subtitle' => '字体应用元素',
'desc' => __( '设置字体应用的元素（CSS 选择器）',
'wp-china-yes' ),
- 'default' => 'a,p,h1,h2,h3,h4,h5,h6,ul,ol,li,button,blockquote,pre,code,table,th,td,div:not([class*="star"]),label,b,i:not([class]),em,small,strong,sub,sup,ins,del,mark,abbr,dfn,span:not([class*="icon"])',
+ 'default' => 'a:not([class]),p,h1,h2,h3,h4,h5,h6,ul,ol,li,button,blockquote,pre,code,table,th,td,label,b,i:not([class]),em,small,strong,sub,sup,ins,del,mark,abbr,dfn,span:not([class])',
'sanitize' => false,
],
[
@@ -231,11 +251,11 @@ class Setting {
'wp-china-yes' ),
],
[
- 'id' => 'adblock_rule',
- 'type' => 'group',
- 'title' => '规则列表',
- 'subtitle' => '使用的广告屏蔽规则列表',
- 'desc' => __( '支持添加多条广告屏蔽规则',
+ 'id' => 'adblock_rule',
+ 'type' => 'group',
+ 'title' => '规则列表',
+ 'subtitle' => '使用的广告屏蔽规则列表',
+ 'desc' => __( '支持添加多条广告屏蔽规则',
'wp-china-yes' ),
'button_title' => '添加规则',
@@ -281,6 +301,72 @@ class Setting {
],
] );
+ WP_CHINA_YES::createSection( $this->prefix, [
+ 'title' => '飞行模式',
+ 'icon' => 'fa fa-plane',
+ 'fields' => [
+ [
+ 'id' => 'plane',
+ 'type' => 'radio',
+ 'title' => __( '飞行模式', 'wp-china-yes' ),
+ 'inline' => true,
+ 'options' => [
+ 'on' => '启用',
+ 'off' => '不启用',
+ ],
+ 'default' => 'off',
+ 'subtitle' => '是否启用飞行模式',
+ 'desc' => __( '文派叶子🍃（WP-China-Yes）独家特色功能，飞行模式可以屏蔽 WordPress 主题插件中国不能访问的服务 API 请求，加速网站前后台访问。注意：部分外部请求为产品更新检测，若屏蔽请定期手动检测。',
+ 'wp-china-yes' ),
+ ],
+ [
+ 'id' => 'plane_rule',
+ 'type' => 'group',
+ 'title' => '规则列表',
+ 'subtitle' => '飞行模式使用的 URL 屏蔽规则列表',
+ 'desc' => __( '支持添加多条 URL 屏蔽规则',
+ 'wp-china-yes' ),
+
+ 'button_title' => '添加规则',
+ 'accordion_title_number' => true,
+ 'dependency' => [
+ 'plane',
+ 'any',
+ 'on',
+ ],
+ 'fields' => [
+ [
+ 'id' => 'name',
+ 'type' => 'text',
+ 'title' => __( '规则名称', 'wp-china-yes' ),
+ 'subtitle' => '自定义规则名称',
+ 'desc' => __( '自定义规则名称，方便识别',
+ 'wp-china-yes' ),
+ 'default' => '默认规则',
+ ],
+ [
+ 'id' => 'url',
+ 'type' => 'textarea',
+ 'title' => __( 'URL', 'wp-china-yes' ),
+ 'subtitle' => 'URL',
+ 'desc' => __( '设置需要屏蔽的 URL 关键词',
+ 'wp-china-yes' ),
+ 'default' => '',
+ 'placeholder' => 'example.com',
+ 'sanitize' => false,
+ ],
+ [
+ 'id' => 'enable',
+ 'type' => 'switcher',
+ 'title' => __( '启用规则', 'wp-china-yes' ),
+ 'subtitle' => '是否启用该规则',
+ 'default' => true,
+ ],
+ ],
+ ]
+ ],
+ ] );
+
WP_CHINA_YES::createSection( $this->prefix, [
'title' => '其他设置',
'icon' => 'fa fa-cogs',
diff --git a/Service/Super.php b/Service/Super.php
index 5395ace..73c5832 100644
--- a/Service/Super.php
+++ b/Service/Super.php
@@ -4,6 +4,7 @@ namespace WenPai\ChinaYes\Service;
defined( 'ABSPATH' ) || exit;
+use WP_Error;
use function WenPai\ChinaYes\get_settings;
/**
@@ -170,56 +171,11 @@ HTML;
}
}
+ /**
+ * adminCDN
+ */
if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
- /**
- * 前台静态加速
- */
- if ( in_array( 'frontend', (array) $this->settings['admincdn'] ) ) {
- $this->page_str_replace( 'template_redirect', 'preg_replace', [
- '#(?<=[(\"\'])(?:' . quotemeta( home_url() ) . ')?/(?:((?:wp-content|wp-includes)[^\"\')]+\.(css|js)[^\"\')]+))(?=[\"\')])#',
- 'https://public.admincdn.com/$0'
- ] );
- }
-
- /**
- * Google 字体替换
- */
- if ( in_array( 'googlefonts', (array) $this->settings['admincdn'] ) ) {
- $this->page_str_replace( 'init', 'str_replace', [
- 'fonts.googleapis.com',
- 'googlefonts.admincdn.com'
- ] );
- }
-
- /**
- * Google 前端公共库替换
- */
- if ( in_array( 'googleajax', (array) $this->settings['admincdn'] ) ) {
- $this->page_str_replace( 'init', 'str_replace', [
- 'ajax.googleapis.com',
- 'googleajax.admincdn.com'
- ] );
- }
-
- /**
- * CDNJS 前端公共库替换
- */
- if ( in_array( 'cdnjs', (array) $this->settings['admincdn'] ) ) {
- $this->page_str_replace( 'init', 'str_replace', [
- 'cdnjs.cloudflare.com/ajax/libs',
- 'cdnjs.admincdn.com'
- ] );
- }
-
- /**
- * jsDelivr 前端公共库替换
- */
- if ( in_array( 'jsdelivr', (array) $this->settings['admincdn'] ) ) {
- $this->page_str_replace( 'init', 'str_replace', [
- 'jsd.admincdn.com',
- 'jsd.admincdn.com'
- ] );
- }
+ $this->load_admincdn();
}
/**
@@ -236,24 +192,93 @@ HTML;
/**
* 文风字体
*/
- if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'optimize' ) {
- add_action( 'init', function () {
- wp_enqueue_style( 'windfonts-optimize', CHINA_YES_PLUGIN_URL . 'assets/css/fonts.css', [], CHINA_YES_VERSION );
- } );
- }
- if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'on' ) {
- add_action( 'wp_head', [ $this, 'load_windfonts' ] );
- add_action( 'admin_head', [ $this, 'load_windfonts' ] );
- }
- if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'frontend' ) {
- add_action( 'wp_head', [ $this, 'load_windfonts' ] );
+ if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+ if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] != 'off' ) {
+ $this->load_typography();
+ }
+ if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'optimize' ) {
+ add_action( 'init', function () {
+ wp_enqueue_style( 'windfonts-optimize', CHINA_YES_PLUGIN_URL . 'assets/css/fonts.css', [], CHINA_YES_VERSION );
+ } );
+ }
+ if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'on' ) {
+ add_action( 'wp_head', [ $this, 'load_windfonts' ] );
+ add_action( 'admin_head', [ $this, 'load_windfonts' ] );
+ }
+ if ( ! empty( $this->settings['windfonts'] ) && $this->settings['windfonts'] == 'frontend' ) {
+ add_action( 'wp_head', [ $this, 'load_windfonts' ] );
+ }
}
/**
* 广告拦截
*/
- if ( ! empty( $this->settings['adblock'] ) && $this->settings['adblock'] == 'on' ) {
- add_action( 'admin_head', [ $this, 'load_adblock' ] );
+ if ( ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+ if ( ! empty( $this->settings['adblock'] ) && $this->settings['adblock'] == 'on' ) {
+ add_action( 'admin_head', [ $this, 'load_adblock' ] );
+ }
+ }
+
+ /**
+ * 飞行模式
+ */
+ if ( ! empty( $this->settings['plane'] ) && $this->settings['plane'] == 'on' ) {
+ $this->load_plane();
+ }
+ }
+
+ /**
+ * 加载 adminCDN
+ */
+ public function load_admincdn() {
+ /**
+ * 前台静态加速
+ */
+ if ( in_array( 'frontend', (array) $this->settings['admincdn'] ) ) {
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '#(?<=[(\"\'])(?:' . quotemeta( home_url() ) . ')?/(?:((?:wp-content|wp-includes)[^\"\')]+\.(css|js)[^\"\')]+))(?=[\"\')])#',
+ 'https://public.admincdn.com/$0'
+ ] );
+ }
+
+ /**
+ * Google 字体替换
+ */
+ if ( in_array( 'googlefonts', (array) $this->settings['admincdn'] ) ) {
+ $this->page_str_replace( 'init', 'str_replace', [
+ 'fonts.googleapis.com',
+ 'googlefonts.admincdn.com'
+ ] );
+ }
+
+ /**
+ * Google 前端公共库替换
+ */
+ if ( in_array( 'googleajax', (array) $this->settings['admincdn'] ) ) {
+ $this->page_str_replace( 'init', 'str_replace', [
+ 'ajax.googleapis.com',
+ 'googleajax.admincdn.com'
+ ] );
+ }
+
+ /**
+ * CDNJS 前端公共库替换
+ */
+ if ( in_array( 'cdnjs', (array) $this->settings['admincdn'] ) ) {
+ $this->page_str_replace( 'init', 'str_replace', [
+ 'cdnjs.cloudflare.com/ajax/libs',
+ 'cdnjs.admincdn.com'
+ ] );
+ }
+
+ /**
+ * jsDelivr 前端公共库替换
+ */
+ if ( in_array( 'jsdelivr', (array) $this->settings['admincdn'] ) ) {
+ $this->page_str_replace( 'init', 'str_replace', [
+ 'jsd.admincdn.com',
+ 'jsd.admincdn.com'
+ ] );
}
}
@@ -298,6 +323,127 @@ HTML
}
}
+ /**
+ * 加载排印优化
+ */
+ public function load_typography() {
+ // code from corner-bracket-lover plugin
+ if ( in_array( 'corner', (array) $this->settings['windfonts_typography'] ) ) {
+ $this->page_str_replace( 'init', 'str_replace', [
+ 'n’t',
+ 'n’t'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’s',
+ '’s'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’m',
+ '’m'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’re',
+ '’re'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’ve',
+ '’ve'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’d',
+ '’d'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’ll',
+ '’ll'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '“',
+ '「'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '”',
+ '」'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '‘',
+ '『'
+ ] );
+ $this->page_str_replace( 'init', 'str_replace', [
+ '’',
+ '』'
+ ] );
+ }
+ // code from space-lover plugin
+ if ( in_array( 'space', (array) $this->settings['windfonts_typography'] ) ) {
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~(\p{Han})([a-zA-Z0-9\p{Ps}\p{Pi}])(?![^<]*>)~u',
+ '\1 \2'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~([a-zA-Z0-9\p{Pe}\p{Pf}])(\p{Han})(?![^<]*>)~u',
+ '\1 \2'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~([!?‽:;,.%])(\p{Han})~u',
+ '\1 \2'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~(\p{Han})([@$#])~u',
+ '\1 \2'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~(&?(?:amp)?;) (\p{Han})(?![^<]*>)~u',
+ '\1\2'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~(\p{Han})(<(?!ruby)[a-zA-Z]+?[^>]*?>)([a-zA-Z0-9\p{Ps}\p{Pi}@$#])~u',
+ '\1 \2\3'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~(\p{Han})(<\/(?!ruby)[a-zA-Z]+>)([a-zA-Z0-9])~u',
+ '\1\2 \3'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~([a-zA-Z0-9\p{Pe}\p{Pf}!?‽:;,.%])(<(?!ruby)[a-zA-Z]+?[^>]*?>)(\p{Han})~u',
+ '\1 \2\3'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~([a-zA-Z0-9\p{Ps}\p{Pi}!?‽:;,.%])(<\/(?!ruby)[a-zA-Z]+>)(\p{Han})~u',
+ '\1\2 \3'
+ ] );
+ $this->page_str_replace( 'template_redirect', 'preg_replace', [
+ '~[ ]*([「」『』（）〈〉《》【】〔〕〖〗〘〙〚〛])[ ]*~u',
+ '\1'
+ ] );
+ }
+ // code from quotmarks-replacer plugin
+ if ( in_array( 'punctuation', (array) $this->settings['windfonts_typography'] ) ) {
+ $qmr_work_tags = array(
+ 'the_title', // http://codex.wordpress.org/Function_Reference/the_title
+ 'the_content', // http://codex.wordpress.org/Function_Reference/the_content
+ 'the_excerpt', // http://codex.wordpress.org/Function_Reference/the_excerpt
+ // 'list_cats', Deprecated. http://codex.wordpress.org/Function_Reference/list_cats
+ 'single_post_title', // http://codex.wordpress.org/Function_Reference/single_post_title
+ 'comment_author', // http://codex.wordpress.org/Function_Reference/comment_author
+ 'comment_text', // http://codex.wordpress.org/Function_Reference/comment_text
+ // 'link_name', Deprecated.
+ // 'link_notes', Deprecated.
+ 'link_description', // Deprecated, but still widely used.
+ 'bloginfo', // http://codex.wordpress.org/Function_Reference/bloginfo
+ 'wp_title', // http://codex.wordpress.org/Function_Reference/wp_title
+ 'term_description', // http://codex.wordpress.org/Function_Reference/term_description
+ 'category_description', // http://codex.wordpress.org/Function_Reference/category_description
+ 'widget_title', // Used by all widgets in themes
+ 'widget_text' // Used by all widgets in themes
+ );
+
+ foreach ( $qmr_work_tags as $qmr_work_tag ) {
+ remove_filter( $qmr_work_tag, 'wptexturize' );
+ }
+ }
+ }
+
/**
* 加载广告拦截
*/
@@ -322,6 +468,27 @@ HTML
}
}
+ /**
+ * 加载飞行模式
+ */
+ public function load_plane() {
+ add_filter( 'pre_http_request', function ( $preempt, $parsed_args, $url ) {
+ foreach ( (array) $this->settings['plane_rule'] as $rule ) {
+ if ( empty( $rule['enable'] ) ) {
+ continue;
+ }
+ if ( empty( $rule['url'] ) ) {
+ continue;
+ }
+ if ( strpos( $url, $rule['url'] ) !== false ) {
+ return new WP_Error( 'http_request_not_executed', '无用 URL 已屏蔽访问' );
+ }
+ }
+
+ return $preempt;
+ }, PHP_INT_MAX, 3 );
+ }
+
/**
* WordPress.Org 替换
*/
diff --git a/assets/css/setting.css b/assets/css/setting.css
index a9ebcba..f72e77b 100644
--- a/assets/css/setting.css
+++ b/assets/css/setting.css
@@ -18,10 +18,11 @@
color: #dcdcde;
}
-.contributors-name a{
+.contributors-name a {
line-height: 2;
padding: 0.5em;
}
+
.wp_china_yes-content a {
color: #3858e9;
text-decoration: none;
diff --git a/helpers.php b/helpers.php
index bf78610..c5fa9c0 100644
--- a/helpers.php
+++ b/helpers.php
@@ -9,15 +9,18 @@ function get_settings() {
$settings = is_multisite() ? get_site_option( 'wp_china_yes' ) : get_option( 'wp_china_yes' );
return wp_parse_args( $settings, [
- 'store' => 'wenpai',
- 'admincdn' => [ 'admin' ],
- 'cravatar' => 'cn',
- 'windfonts' => 'off',
- 'windfonts_list' => [],
- 'adblock' => 'off',
- 'adblock_rule' => [],
- 'monitor' => true,
- 'hide' => false,
- 'custom_name' => 'WP-China-Yes',
+ 'store' => 'wenpai',
+ 'admincdn' => [ 'admin' ],
+ 'cravatar' => 'cn',
+ 'windfonts' => 'off',
+ 'windfonts_list' => [],
+ 'windfonts_typography' => [],
+ 'adblock' => 'off',
+ 'adblock_rule' => [],
+ 'plane' => 'off',
+ 'plane_rule' => [],
+ 'monitor' => true,
+ 'hide' => false,
+ 'custom_name' => 'WP-China-Yes',
] );
}
diff --git a/languages/wp-china-yes-en_US.mo b/languages/wp-china-yes-en_US.mo
deleted file mode 100644
index 4c31d5666c01ab038964f60bf85fbd4b6741aa24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5870
zcmcIoTWl298J@PJP26kJ>qFI^AVneyyBLQcVnQTBE{z%zH;~XgMdR7CyA#jOY-VQd
zIIUFM#CIE;0={5V$AGb$fX&4iUv{z7*H(S%Th;a_-C**@7=E{$~Q3n{)395!FI#`2=pTIU_{E6`S
zVrUm&pT>9=_F33}!J4p7)hNn-*vqiA-(N%P!+sUdpTYhbe*6daY1mdwdII*=Hx=bi
zc>j-YVLhI&ep^xg0Q<>z6y+DNR~`xW`}cPh;6Dd9)|rREbaR@SU{$Duy8|x8!`@<@&`+0
ztaLuD#Z>u0N)*7Zz-9SCND9)UAT5uS=J7*2
zldhX~>i6tXV=3L#VrEpcQhRnXSG5z|J+$-fMng55c0TJ55BPmK(f47oZR%dON6tR-
z{Hyn}z0d4XpB2};*a^#yHQ3y7SpMz>|Mp1X{0GGg<6c|4H`1M7TM|9p-r&Xj@~Y^(
zDmriYw?FV!hwo(vu%%f4xR5(t_;}o(UoVc%;{>sK<&(A!uVYROEqDXH#mP1?yihnh
zhhO|F?SU7x|MW^>Vji1#6N}>V`NCS4-`C-tniV}u;=)C3Knqwum
zS+EjkD4T%LY_(ZM_}c&>dM^0$m&N5padHSi90_NKK)e(_GBG)qU%nqwST$aJ**Jd!2m3E;sS$?@MpZ&0OLKs`ItrtF1B=f!grA~ID;c(z4
z^M-y4co7P`$*-;DbLT|1O$?p(+d9RCZUBe_{O*s$of~i^zd9?hy>@UoC
zlY^pf8V==`2gQxH;`nfW^;9L9h-))MExH+tTc+!5gAp=bymU%j8_nm=z^fCb=^;oU
z0iuUD$a-=5wzquKn>quZuq;?3R+hxVN`85*cya6#5J*NSx;hC}Hq><|JDA8!x&vpr&bE?jc`BnY%+##_=6EvcJoq?HE|sWE4B1;9IR@vazJ
z64!=5ofJ;ST~w!OcR)3jBi~UfV1n7r8UR
zAYmVjk1hpkgL3h^Zw2GQG_Pj_L@thAD@8s4{^Zv$_zUf2Kv72CwM$}oIVh$tJm5nA
zRWZL*=w0!9Z&oU9{`YXm>j%4fz2(kAPtH5H=qo4U8h=D?ktX922h0?
zYw(=#ktxsLy)8OtD5-L$SXmdR`#^|d+xf!Oj2P%Zdle1wCjeo8vz_4Xr20cpsGshPrL|0Xrq#Es3ws4y3#_st`{u&lbnKL{Aq=
zA5d%#gqvwqr!`xsd&uojXq~t!#J*1uT$u*6_0i_EdC#w3dPFkoDrnV};%xZ}KV~
zk~<@M2ZKjw2zv}gHxP=$ott6JU1<-?ymYbse+HFm1y=%21q4yV>RBun%N=5JRjICb
zwspaKV+(=ESCP7Kb_#c%m|87NxB2sTy^)-sTYx~r)k5EjxYFSd=O7~9$aUPOGl`;9i0JVo!g497Tf5IG;T)7P5Z#
zV&FE)*SmEtkSlR#CZC(!;H@`0OUag1g$pm#+E=Zuy{y(;rMg{F0=JX~+j@s?M99|2|X5hE|YK~$E|u+)9_m4b>6Jgg2?l#%j;QPZQZ^|
z?SV+$lWcEYecj$CY7f-b*1V!RZsfSFnvS8mmW`FKsAeLgCV1pHS5x)u1v6pjPLl0<
z!_-|KW5-l>e+!t-K{~6ZPkdpXxS;Jo|$R+=p3p$$bw%F
zne5R+Z12IEUq)WyCbxq)8Y~{uUG`*jUvwYdykcoq#l1Qd>)yQw8Om&bbU$7{Z>8W_
zJq?s^)tb#c#OL&zrB01>lsPTBt0lR^+$3iXP}4OQ*9|$Kx>bC%xuIj!GMQ_!bf(e3
zM6{$<#@1-E#hf$;@R>Ag;f)TGz*G%yoG5$C$}mkekpZ>Q;PRk!z!y3dhnTbwJ2VDs
z3<3uusw3a;mRpDCcjdAHFQUp1oa4Kyo2$s;zDBE?|Yz0Ei+_2!6#9Rlt69gxg
zz+s2m&AP@Jh9xGt&8!xa0EuNZ7xYAL})=kc0I0Zk~jhJG7fl$KeKfc%%t2Q5pf%TIHD|(L|}{=F;a9C9O$RZYyvnE
zgT@d&syT?FEM2C?@eoKK+$sxHAiES=N;NZpT=JG8gBWW~k|Ue@%qrR6=FdZ1f-Xf|
zstL+|=q-_R%M{+XX+9360bz7a4|yT$l5h#6pY19&(E7$dvwd?4Act1^#zp}V=ovYY56-0wy!
vPBocj#LAorFPD%k$_D9~c+XYh^XGepZODXkE$}#RzE|mWP2{^lB
diff --git a/languages/wp-china-yes-en_US.po b/languages/wp-china-yes-en_US.po
deleted file mode 100644
index 9e7e54b..0000000
--- a/languages/wp-china-yes-en_US.po
+++ /dev/null
@@ -1,171 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WP-China-Yes\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-23 03:41+0000\n"
-"PO-Revision-Date: 2024-08-23 12:21+0800\n"
-"Last-Translator: \n"
-"Language-Team: English (United States)\n"
-"Language: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 3.4.4\n"
-"X-Loco-Version: 2.6.11; wp-6.6\n"
-"X-Domain: wp-china-yes\n"
-
-#: Service/Setting.php:54
-msgid ""
-"萌芽加速（adminCDN）"
-"将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需要"
-"加速的项目，更多细节控制和功能，请关注 adminCDN 项目。"
-msgstr ""
-"adminCDN switches "
-"the static files that WordPress relies on to public resources to speed up "
-"website access. You can enable the projects that need to be accelerated as "
-"needed. For more detailed control and functions, please pay attention to the "
-"adminCDN project."
-
-#: Service/Setting.php:72
-msgid ""
-"初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 Cravatar.com 上传头像，更多选项请安"
-"装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 "
-"WordPress）"
-msgstr ""
-"Cravatar is a "
-"perfect alternative to Gravatar in China. You can upload your avatar on "
-"Cravatar.com. For more options, please install the WPAavatar plugin. (Any "
-"developer can integrate this service into their own products, not limited to "
-"WordPress)"
-
-#: Service/Setting.php:86
-msgid ""
-"文风字体（Windfonts）为您的网页渲染中文字体并对主题、插件内的字体进行加速；优化模式可优化浏览器"
-"字体调用。"
-msgstr ""
-"Windfonts renders "
-"Chinese fonts for your web pages and accelerates fonts in themes and plug-"
-"ins; the optimization mode can optimize browser font calls."
-
-#: Service/Setting.php:109
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）支持自动监控各加速节点可用性，当节点不可用时自动切换至可用节点"
-"或关闭加速，以保证您的网站正常访问。"
-msgstr ""
-"WP-China-Yes 🍃 "
-"(文派叶子) supports automatic monitoring of the availability of each "
-"acceleration node. When a node is unavailable, it automatically switches to "
-"an available node or turns off acceleration to ensure normal access to your "
-"website."
-
-#: Service/Setting.php:98
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用"
-"插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，"
-"查看可优化插件列表。"
-msgstr ""
-"WP-China-Yes 🍃 "
-"(文派叶子) unique features allow you to have a clean and tidy WordPress "
-"backend, removing all kinds of intrusive backend ads, notifications and "
-"useless information from commonly used plugins; if there is abnormal "
-"interception after enabling, please switch to manual mode and check the list of optimizable "
-"plugins."
-
-#: Service/Setting.php:41
-msgid ""
-"官方加速源（WPMirror）直接从 .org 反代至大陆分发；文派开源（WenPai.org）中国境内自建托管仓库，同时集成文"
-"派翻译平台。"
-msgstr ""
-"The official "
-"acceleration source (WPMirror) is directly reverse-generated from .org "
-"to the mainland for distribution; WenPai.org Open Source has its own hosting warehouse "
-"in China and is integrated with the WenPai translation platform."
-
-#. Author URI of the plugin
-msgid "https://wp-china-yes.com"
-msgstr "https://wp-china-yes.com"
-
-#. Name of the plugin
-#: Service/Setting.php:143 Service/Setting.php:144
-msgid "WP-China-Yes"
-msgstr "WP-China-Yes"
-
-#: Plugin.php:52
-#, php-format
-msgid ""
-"WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。"
-msgstr ""
-"The WP-China-Yes plugin requires PHP 5.6.0 or higher. The current version is "
-"%s and the plugin has been automatically disabled."
-
-#: Service/Setting.php:71
-msgid "初认头像"
-msgstr "Cravatar"
-
-#: Service/Setting.php:97
-msgid "广告拦截"
-msgstr "Ad Blocker"
-
-#: Service/Setting.php:40
-msgid "应用市场"
-msgstr "App Market"
-
-#. Description of the plugin
-msgid ""
-"文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，"
-"生生不息。"
-msgstr ""
-"WP-China-Yes 🍃 (文派叶子) is the infrastructure software for the Chinese "
-"WordPress ecosystem, just like fallen leaves sprouting new leaves, it is "
-"everlasting."
-
-#. Author of the plugin
-msgid "文派开源"
-msgstr "WenPai.org"
-
-#: Service/Setting.php:85
-msgid "文风字体"
-msgstr "Windfonts"
-
-#: Plugin.php:71
-msgid "检测到不兼容的插件 Kill 429，已自动禁用！"
-msgstr "Incompatible plugin Kill 429 detected, automatically disabled!"
-
-#: Plugin.php:65
-msgid "检测到不兼容的插件 WP-China-Plus，已自动禁用！"
-msgstr "Incompatible plugin WP-China-Plus detected and automatically disabled!"
-
-#: Plugin.php:78
-msgid ""
-"检测到已在 WordPress 配置文件中设置代理服务器，这可能会导致插件无法正常工作！"
-msgstr ""
-"A proxy server has been detected in the WordPress configuration file. This "
-"may cause the plugin to not work properly!"
-
-#: Plugin.php:59
-msgid "检测到旧版插件 WP-China-No，已自动禁用！"
-msgstr ""
-"An old version of the plugin WP-China-No has been detected and automatically "
-"disabled!"
-
-#: Service/Setting.php:108
-msgid "自动监控"
-msgstr "Automatic Monitor"
-
-#: Service/Setting.php:53
-msgid "萌芽加速"
-msgstr "adminCDN"
-
-#: Service/Setting.php:32 Service/Setting.php:155
-msgid "设置"
-msgstr "Setting"
diff --git a/languages/wp-china-yes-zh_CN.mo b/languages/wp-china-yes-zh_CN.mo
deleted file mode 100644
index b2774338414318a58e6eaa183a91dd709e52971f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5468
zcmeHKOK%(36`rPQo3M{G?sE~e0|8wHBhiX&I8%v
z@aW^cb06P1=R4seWc@AAaD2|eUjVP8{{^Rg+ra|x
zCG=N;XMtY#
z@Nu0Ez7Ax(F9ShSz_xZ9u>atbZ7WO?KvVds^93Oh;C2BN><1s`Lw?FRxu>&-Ad?8
z>pSoE%IbTqXRUP7O4LZ=RwJCnMCiB=sj!e1}&#|t4SUYfAxOr#J%GVn+dF(*S
zE1!i2=)f9D6=*Wvm=BY5!JJ&f4{IgDS+MnUB{P%9A~dr}mTsDrAuBOJ$5u&fn|zFw
zv({h@U#-GJ5`91)tciQHMLrXI2!|Zu)8*?j%zuI-NNmB%FOj89GMIuRx}4FDBVKcw
zBAH(^it8j(15J`onmc1OQ#UG$bh<=yF-F-o&ZsP7q`0>V+fy`(38Q*zZwJS=MmP@6
z%#wWET8xTUyuao&MVk5;?u98}V^k_eZHiRGBsFe@qhw(i4#Wo5@F(QqJy0>qt7IYq
zW{u1cjis%^GMyhKi5v(S#ZhuE+?Y!n<*{ZkVb@_7eGpLnS2Z;he1eY<@y6m9S)Va#
z6JT{^Z@A+mhyd1u4Wi!2ZPDU=nwgF24<60{
zu%nwhB(+V}(_dsq2bp1Bsmq@DdnM@DMkgWI2=jMh&CHB5F{W>DqR^%}Py#>jpy5@x
zoYW?GC-Xh;pV{VfdAeA`4|qQxMq|?ua${zF&+;VnW7HR{LS)~eNF%zwNQyaPEXey5DG&W=9)>u`1g75nR
zx~@I3yyRz5B6xi50tt~_uqQYIGc%iXY}u%ciEWzREt1qIstVJ|(rROFh{T4F`f$Zz
zLlm`N4zM|osqT)pt6^tLMfLKr`x(nh8M!@(BxL%mlxcj{%;${C1SuoMlO&y_GuynV
z@Wsq}#VU-G5(K=#9C0vL9%(oQjF)!N`?^;=*>y10JW;{mc@3Kv56C^&$
zo2Vh;uaI;}r#L*k@8sM{#7XnLgY7>fC>*Td0@oB5h(OAdm`sWTWWFpM%y;qe2~TGW
zyvQFAwKfs(I2kqN8Rl50)?xo`Ah*LXT#8h@UGczgW|%&ml>07#r1_q)@enH#u#jFMTk@
z%N2RJY}Do-VM}LLS+MP_!hz@1+KbxbSstvp!oll`z-b9yUHgOL3rTPIrMDG57|>Kt
zb5&Gu*IP=zriY{p!R~-x`pvcOpma&|h%WDMrMHyp0X9K8Cx;Y|*x~LtA-PXW9WRQ<
zJ3Jlk7u=`aZr6D^7?LjOvKs7_Lz<46=Vi6~n%u2OmlV0rBbxaz4n%&??SJ!#AN9P`
zbaWIc%6+2u>GN~fFS*w$AS
zU3x|JY5suP?GaDE8wj}&SY7UwUe)xzphr~u?Pl=I@lKKdJmc-wVlG}b6Ourd05B(De5|WXE?fFIv4Gu`{mL7
j^5}kv|57?9-G8}IAKfpH?w3dR%jT8q=zjVCdcXWPOdu@z
diff --git a/languages/wp-china-yes-zh_CN.po b/languages/wp-china-yes-zh_CN.po
deleted file mode 100644
index 08cf984..0000000
--- a/languages/wp-china-yes-zh_CN.po
+++ /dev/null
@@ -1,160 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WP-China-Yes\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-23 03:41+0000\n"
-"PO-Revision-Date: 2024-08-23 12:20+0800\n"
-"Last-Translator: \n"
-"Language-Team: 简体中文\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.4.4\n"
-"X-Loco-Version: 2.6.10; wp-6.6\n"
-"X-Domain: wp-china-yes\n"
-
-#: Service/Setting.php:54
-msgid ""
-"萌芽加速（adminCDN）"
-"将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需"
-"要加速的项目，更多细节控制和功能，请关注 adminCDN 项目。"
-msgstr ""
-"萌芽加速（adminCDN）"
-"将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需"
-"要加速的项目，更多细节控制和功能，请关注 adminCDN 项目。"
-
-#: Service/Setting.php:72
-msgid ""
-"初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 Cravatar.com 上传头像，更多选项请"
-"安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 "
-"WordPress）"
-msgstr ""
-"初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 Cravatar.com 上传头像，更多选项请"
-"安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 "
-"WordPress）"
-
-#: Service/Setting.php:86
-msgid ""
-"文风字体（Windfonts）为您的网页渲染中文字体并对主题、插件内的字体进行加速；优化模式可优化浏览器"
-"字体调用。"
-msgstr ""
-"文风字体（Windfonts）为您的网页渲染中文字体并对主题、插件内的字体进行加速；优化模式可优化浏览器"
-"字体调用。"
-
-#: Service/Setting.php:109
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）支持自动监控各加速节点可用性，当节点不可用时自动切换至可用节"
-"点或关闭加速，以保证您的网站正常访问。"
-msgstr ""
-"文派叶子🍃（WP-"
-"China-Yes）支持自动监控各加速节点可用性，当节点不可用时自动切换至可用节"
-"点或关闭加速，以保证您的网站正常访问。"
-
-#: Service/Setting.php:98
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用"
-"插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，"
-"查看可优化插件列表。"
-msgstr ""
-"文派叶子🍃（WP-"
-"China-Yes）独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用"
-"插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，"
-"查看可优化插件列表。"
-
-#: Service/Setting.php:41
-msgid ""
-"官方加速源（WPMirror）直接从 .org 反代至大陆分发；文派开源（WenPai.org）中国境内自建托管仓库，同时集成文"
-"派翻译平台。"
-msgstr ""
-"官方加速源（WPMirror）直接从 .org 反代至大陆分发；文派开源（WenPai.org）中国境内自建托管仓库，同时集成文"
-"派翻译平台。"
-
-#. Author URI of the plugin
-msgid "https://wp-china-yes.com"
-msgstr "https://wp-china-yes.com"
-
-#. Name of the plugin
-#: Service/Setting.php:143 Service/Setting.php:144
-msgid "WP-China-Yes"
-msgstr "WP-China-Yes"
-
-#: Plugin.php:52
-#, php-format
-msgid ""
-"WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。"
-msgstr ""
-"WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。"
-
-#: Service/Setting.php:71
-msgid "初认头像"
-msgstr "初认头像"
-
-#: Service/Setting.php:97
-msgid "广告拦截"
-msgstr "广告拦截"
-
-#: Service/Setting.php:40
-msgid "应用市场"
-msgstr "应用市场"
-
-#. Description of the plugin
-msgid ""
-"文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，"
-"生生不息。"
-msgstr ""
-"文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，"
-"生生不息。"
-
-#. Author of the plugin
-msgid "文派开源"
-msgstr "文派开源"
-
-#: Service/Setting.php:85
-msgid "文风字体"
-msgstr "文风字体"
-
-#: Plugin.php:71
-msgid "检测到不兼容的插件 Kill 429，已自动禁用！"
-msgstr "检测到不兼容的插件 Kill 429，已自动禁用！"
-
-#: Plugin.php:65
-msgid "检测到不兼容的插件 WP-China-Plus，已自动禁用！"
-msgstr "检测到不兼容的插件 WP-China-Plus，已自动禁用！"
-
-#: Plugin.php:78
-msgid ""
-"检测到已在 WordPress 配置文件中设置代理服务器，这可能会导致插件无法正常工"
-"作！"
-msgstr ""
-"检测到已在 WordPress 配置文件中设置代理服务器，这可能会导致插件无法正常工"
-"作！"
-
-#: Plugin.php:59
-msgid "检测到旧版插件 WP-China-No，已自动禁用！"
-msgstr "检测到旧版插件 WP-China-No，已自动禁用！"
-
-#: Service/Setting.php:108
-msgid "自动监控"
-msgstr "自动监控"
-
-#: Service/Setting.php:53
-msgid "萌芽加速"
-msgstr "萌芽加速"
-
-#: Service/Setting.php:32 Service/Setting.php:155
-msgid "设置"
-msgstr "设置"
diff --git a/languages/wp-china-yes-zh_TW.mo b/languages/wp-china-yes-zh_TW.mo
deleted file mode 100644
index 69ac10ceb5e68effc045a644c6af17621786528e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5492
zcmchb+jARN9mf|4(3)!lr93dO;~AbhvK=?cBu!oc-O;NBR576Hx)zOZa>bpTFSq1AIcC!yjDFeI6fte;%?G^5ho;;m;U9b3zcF
zK%V%bAp8;IpFpyCzyGozd==v#J|_r0kY32|LjD7ijh}d)%NKO{eaPDwe_6j@&}A0#
zJjP3qmmvQMX@NY`A_!+8mmt}Gf77J``6b+c0yzLZ{sqbOF=G0@
zyl%DicH2yLyD06?DmyXx?ua@Yr%o4*d8Ohm@pIIkaMSTs;@c%3VdptzxQwSt_95|X(XF&tQCs9I@eZNE5j{5JZ6nNoiX(_`R>>@p
zrEM}Ch9fTPvvo(jq2G!mnU?Y!BvFQ%BomVN$7$j~DlXF49!>d}%9?RfaTznk$}a4k
zqLdFvrTNMmblX&?A38HjGJa*zBVO$f{$Wz|RGX?;m<7zxxg;&+A&
zJ^f~j(eQzZTV(9DH&y_&qucu=yh}DBPv*vknPJ_A%i6+Une4i4bP5UUV*U=K<-`O_
z#>fa)6uBw8_n;s2pw3meoRlZ|AoD#RpWfwbdATUwEk4etQC|#+tWIxKEDs@nq=Q){
z>#8~wWkfd?Nj}eu=`%N24&Eo3UD>~<_%~}6m-!e9(IB$RPxBtxSEkWzy6r*$YpErY
z$T$h-SS{o|YJ3Tfk{=YIIrEPea%q2uc$QgEwV7n^fJ_9C5UTU8Jhx230XjX8$yB4X#k%8eYWer_zV0KZqFdq+vSDEz8MZLpNy1jmE^N
zWgO2_-?WlSv#$6Q-w&E?HtSQ{OJ)Wwg2z{DkVvwt+5$bnNPw6qW1**+T;7m?P?I<~+|+As#if^d}V>_GzrFl(T5iP*o1>krlTRDWi$d
zSPthY8=RWMKQsWOF!NJ=DA-N4kqUItNq2(8mt)<+QzDr?loK~!{Hb|hKs?=fo_Xo8
zD;}3z$F8i#rF-BO^XGBP@r<2TwUb`;jLGE;w1k211nk8v@==bA@^c047kerPaTEy-
zW2tnPWJ`*7o2!lTrCU+nuE@h>shm8dEuCIv!Pcq@2cF(*-?lc_vcBgE^|&H%wS;b)
z^`@!EVR*CG@C%d8Znj#wYP+I?x4dH-vf3PmtM)!~ui?kH`s{{l)-JK7`)7uCOt;N!
zf#HhLVd@e)J33DrI?fq7UlC7rcAYx^a>u!jj+VEKc8B4b&1kU?7#&s{R=#Dl^xZP{
znGDxV#=$O8-gBwzQ~aQ-KI;-c?0@gt^_Ht|UVW{m*QvISmdiL{O%`nV!4Tf*F#W;N
zJ~Uu7TP}z_{YIM|boTRWuN%(Q=CN1bFxd>RS$eF!W=mg}cM7dN$PE7@UwZ4Zj`8KzHj-bRO;S&gu1x`{SYHn(WOs!xx4eh=
za(9#QWqOT7!_E0JiZVRPmn7%YVU6?Uc23SZoABj&P@PU5;!D1==>hNze7QEJ&Tl*u
zUnYZ$iT-20B<`)s8!CM1%B%ApWj(0znAH*48CF)xoHDU9nJAI)degYq
z*N4W<$55s+;r~?13~#fJ7mUh@#d^v_hN{JTI!$VnDMxqtV2v{4ZoZZmO_ehFG#tE0
zXEo+ON|_t}s#|N6sg=}cZm>L-Zbq4tj4~%(hbXf=g)r6YSQTm`~Lt+IkMXvW>VyKq!upt+F+Xd=oi5BVsspu?ca-6p4l_(j2S^EleX|14B#6CFi^
z&H5d5PzpwgEBP$QS!wD5PcWV>0`>ZJ萌芽加速（adminCDN）"
-"将 WordPress 依赖的静态文件切换为公共资源，加快网站访问速度。您可按需启用需"
-"要加速的项目，更多细节控制和功能，请关注 adminCDN 项目。"
-msgstr ""
-"萌芽加速（adminCDN）"
-"將 WordPress 依賴的靜態檔案切換為公共資源，加快網站訪問速度。您可按需啟用需"
-"要加速的專案，更多細節控制和功能，請關注 adminCDN 專案。"
-
-#: Service/Setting.php:72
-msgid ""
-"初认头像（Cravatar）Gravatar 在中国的完美替代方案，您可以在 Cravatar.com 上传头像，更多选项请"
-"安装 WPAavatar 插件。（任何开发者均可在自己的产品中集成该服务，不局限于 "
-"WordPress）"
-msgstr ""
-"初認頭像（Cravatar）Gravatar 在中國的完美替代方案，您可以在 Cravatar.com 上傳頭像，更多選項請"
-"安裝 WPAavatar 外掛。（任何開發者均可在自己的產品中整合該服務，不侷限於 "
-"WordPress）"
-
-#: Service/Setting.php:86
-msgid ""
-"文风字体（Windfonts）为您的网页渲染中文字体并对主题、插件内的字体进行加速；优化模式可优化浏览器"
-"字体调用。"
-msgstr ""
-"文風字型（Windfonts）為您的網頁渲染中文字型並對主題、外掛內的字型進行加速；最佳化模式可最佳化瀏"
-"覽器字型呼叫。"
-
-#: Service/Setting.php:109
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）支持自动监控各加速节点可用性，当节点不可用时自动切换至可用节"
-"点或关闭加速，以保证您的网站正常访问。"
-msgstr ""
-"文派葉子🍃（WP-"
-"China-Yes）支援自動監控各加速節點可用性，當節點不可用時自動切換至可用節"
-"點或關閉加速，以保證您的網站正常訪問。"
-
-#: Service/Setting.php:98
-msgid ""
-"文派叶子🍃（WP-"
-"China-Yes）独家特色功能，让您拥有清爽整洁的 WordPress 后台，清除各类常用"
-"插件侵入式后台广告、通知及无用信息；启用后若存在异常拦截，请切换为手动模式，"
-"查看可优化插件列表。"
-msgstr ""
-"文派葉子🍃（WP-"
-"China-Yes）獨家特色功能，讓您擁有清爽整潔的 WordPress 後臺，清除各類常用"
-"外掛侵入式後臺廣告、通知及無用資訊；啟用後若存在異常攔截，請切換為手動模式，"
-"檢視可最佳化外掛列表"
-"。"
-
-#: Service/Setting.php:41
-msgid ""
-"官方加速源（WPMirror）直接从 .org 反代至大陆分发；文派开源（WenPai.org）中国境内自建托管仓库，同时集成文"
-"派翻译平台。"
-msgstr ""
-"官方加速源（WPMirror）直接從 .org 反代至大陸分發；文派開源（WenPai.org）中國境內自建託管倉庫，同時整合文"
-"派翻譯平臺。"
-
-#. Author URI of the plugin
-msgid "https://wp-china-yes.com"
-msgstr "https://wp-china-yes.com"
-
-#. Name of the plugin
-#: Service/Setting.php:143 Service/Setting.php:144
-msgid "WP-China-Yes"
-msgstr "文派葉子"
-
-#: Plugin.php:52
-#, php-format
-msgid ""
-"WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。"
-msgstr ""
-"WP-China-Yes 外掛程式需要PHP 5.6.0 或更高版本，目前版本為%s，外掛程式已自動"
-"停用。"
-
-#: Service/Setting.php:71
-msgid "初认头像"
-msgstr "初認頭像"
-
-#: Service/Setting.php:97
-msgid "广告拦截"
-msgstr "廣告攔截"
-
-#: Service/Setting.php:40
-msgid "应用市场"
-msgstr "應用市場"
-
-#. Description of the plugin
-msgid ""
-"文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，"
-"生生不息。"
-msgstr ""
-"文派葉子 🍃（WP-China-Yes）是中國 WordPress 生態基礎設施軟體，猶如落葉新芽，"
-"生生不息。"
-
-#. Author of the plugin
-msgid "文派开源"
-msgstr "文派開源"
-
-#: Service/Setting.php:85
-msgid "文风字体"
-msgstr "文風字體"
-
-#: Plugin.php:71
-msgid "检测到不兼容的插件 Kill 429，已自动禁用！"
-msgstr "偵測到不相容的插件Kill 429，已自動停用！"
-
-#: Plugin.php:65
-msgid "检测到不兼容的插件 WP-China-Plus，已自动禁用！"
-msgstr "偵測到不相容的外掛程式WP-China-Plus，已自動停用！"
-
-#: Plugin.php:78
-msgid ""
-"检测到已在 WordPress 配置文件中设置代理服务器，这可能会导致插件无法正常工"
-"作！"
-msgstr ""
-"偵測到已在WordPress 設定檔中設定代理伺服器，這可能會導致外掛無法正常運作！"
-
-#: Plugin.php:59
-msgid "检测到旧版插件 WP-China-No，已自动禁用！"
-msgstr "偵測到舊版外掛程式WP-China-No，已自動停用！"
-
-#: Service/Setting.php:108
-msgid "自动监控"
-msgstr "自動監控"
-
-#: Service/Setting.php:53
-msgid "萌芽加速"
-msgstr "萌芽加速"
-
-#: Service/Setting.php:32 Service/Setting.php:155
-msgid "设置"
-msgstr "設定"
From 82ca5e5dc4e96e6bfc47bbee4e8cb1a0cfd8f476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Wed, 25 Sep 2024 16:47:55 +0800
Subject: [PATCH 32/54] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E4=B8=AD=E7=9A=84=E8=AE=B8=E5=8F=AF=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index b4944af..dc15555 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"require": {
"yahnis-elsts/plugin-update-checker": "^5.2"
},
- "license": "MIT",
+ "license": "GPL-3.0-or-later",
"autoload": {
"psr-4": {
"WenPai\\ChinaYes\\": "./"
From 2b7c57a4275447948d1139b27b629157656055db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Wed, 25 Sep 2024 17:05:46 +0800
Subject: [PATCH 33/54] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2=E6=8F=92=E4=BB=B6=E5=88=97=E8=A1=A8=E7=9A=84=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Setting.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index 9d4e8cb..504b598 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -342,11 +342,11 @@ class Setting {
'subtitle' => '自定义规则名称',
'desc' => __( '自定义规则名称，方便识别',
'wp-china-yes' ),
- 'default' => '默认规则',
+ 'default' => '未命名规则',
],
[
'id' => 'url',
- 'type' => 'textarea',
+ 'type' => 'text',
'title' => __( 'URL', 'wp-china-yes' ),
'subtitle' => 'URL',
'desc' => __( '设置需要屏蔽的 URL 关键词',
@@ -496,6 +496,13 @@ HTML,
* 挂载设置页面
*/
public function admin_menu() {
+ // 自定义名称
+ add_filter( 'all_plugins', function ( $plugins ) {
+ $plugins['wp-china-yes/wp-china-yes.php']['Name'] = $this->settings['custom_name'];
+
+ return $plugins;
+ } );
+
// 插件页设置
add_filter( 'plugin_action_links', function ( $links, $file ) {
if ( 'wp-china-yes/wp-china-yes.php' !== $file ) {
From 789c9200322bc3d1d6dbd6efb6aa36c2fde291b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Wed, 25 Sep 2024 17:15:09 +0800
Subject: [PATCH 34/54] =?UTF-8?q?feat:=20=E6=8F=90=E5=8D=87PHP=E5=88=B07.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Setting.php | 4 +++-
wp-china-yes.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index 504b598..80d7fc7 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -498,7 +498,9 @@ HTML,
public function admin_menu() {
// 自定义名称
add_filter( 'all_plugins', function ( $plugins ) {
- $plugins['wp-china-yes/wp-china-yes.php']['Name'] = $this->settings['custom_name'];
+ if ( isset( $plugins['wp-china-yes/wp-china-yes.php'] ) ) {
+ $plugins['wp-china-yes/wp-china-yes.php']['Name'] = $this->settings['custom_name'];
+ }
return $plugins;
} );
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 0d93e57..278cb81 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -11,7 +11,7 @@
* Network: True
* Requires at least: 4.9
* Tested up to: 9.9.9
- * Requires PHP: 5.6.0
+ * Requires PHP: 7.0.0
* License URI: http://www.gnu.org/licenses/gpl-3.0.html
*/
From 7121b4b7ef91b645ac5046427596a2ea5855c60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Tue, 19 Nov 2024 17:47:44 +0800
Subject: [PATCH 35/54] =?UTF-8?q?feat:=20=E6=80=A7=E8=83=BD=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Plugin.php | 20 +++++---
Service/Base.php | 14 ++----
Service/Monitor.php | 56 ++++++++++++-----------
Service/Super.php | 10 ++--
composer.lock | 14 +++---
framework/classes/admin-options.class.php | 2 +-
framework/functions/actions.php | 2 +-
wp-china-yes.php | 2 +-
8 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/Plugin.php b/Plugin.php
index 3d74313..4723162 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -5,7 +5,6 @@ namespace WenPai\ChinaYes;
defined( 'ABSPATH' ) || exit;
use WenPai\ChinaYes\Service\Base;
-use WenPai\ChinaYes\Service\Setting;
class Plugin {
@@ -14,8 +13,9 @@ class Plugin {
*/
public function __construct() {
new Base();
- new Setting();
- add_action( 'plugins_loaded', [ $this, 'plugins_loaded' ] );
+ if ( is_admin() ) {
+ add_action( 'plugins_loaded', [ $this, 'plugins_loaded' ] );
+ }
}
/**
@@ -40,6 +40,15 @@ class Plugin {
public function plugins_loaded() {
load_plugin_textdomain( 'wp-china-yes', false, CHINA_YES_PLUGIN_PATH . 'languages' );
add_action( 'admin_notices', [ $this, 'admin_notices' ] );
+ /**
+ * 插件列表页中所有插件增加「参与翻译」链接
+ */
+ add_filter( sprintf( '%splugin_action_links', is_multisite() ? 'network_admin_' : '' ), function ( $links, $plugin = '' ) {
+ $links[] = '参与翻译';
+ $links[] = '去广告';
+
+ return $links;
+ }, 10, 2 );
}
/**
@@ -47,9 +56,9 @@ class Plugin {
*/
public static function check() {
$notices = [];
- if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+ if ( version_compare( PHP_VERSION, '7.0.0', '<' ) ) {
deactivate_plugins( 'wp-china-yes/wp-china-yes.php' );
- $notices[] = '' . sprintf( __( 'WP-China-Yes 插件需要 PHP 5.6.0 或更高版本，当前版本为 %s，插件已自动禁用。',
+ $notices[] = '
' . sprintf( __( 'WP-China-Yes 插件需要 PHP 7.0.0 或更高版本，当前版本为 %s，插件已自动禁用。',
'wp-china-yes' ),
PHP_VERSION ) . '
';
}
@@ -70,7 +79,6 @@ class Plugin {
$notices[] = '
' . __( '检测到不兼容的插件 Kill 429，已自动禁用！', 'wp-china-yes' ) . '
';
-
}
// 代理服务器检测
if ( defined( 'WP_PROXY_HOST' ) || defined( 'WP_PROXY_PORT' ) ) {
diff --git a/Service/Base.php b/Service/Base.php
index 238172e..5938a15 100644
--- a/Service/Base.php
+++ b/Service/Base.php
@@ -12,21 +12,15 @@ defined( 'ABSPATH' ) || exit;
class Base {
public function __construct() {
- /**
- * 插件列表页中所有插件增加「参与翻译」链接
- */
- add_filter( sprintf( '%splugin_action_links', is_multisite() ? 'network_admin_' : '' ), function ( $links, $plugin = '' ) {
- $links[] = '
参与翻译';
- $links[] = '
去广告';
-
- return $links;
- }, 10, 2 );
-
// 加速服务
new Super();
// 监控服务
new Monitor();
// 更新服务
new Update();
+ if ( is_admin() ) {
+ // 设置服务
+ new Setting();
+ }
}
}
diff --git a/Service/Monitor.php b/Service/Monitor.php
index e59aab6..73fb085 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -17,40 +17,44 @@ class Monitor {
public function __construct() {
$this->settings = get_settings();
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_store' ); // TODO 下个版本移除
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_cravatar' ); // TODO 下个版本移除
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_admincdn' ); // TODO 下个版本移除
if ( $this->settings['monitor'] ) {
- return;
+ // 站点网络下只在主站运行
+ if ( is_main_site() ) {
+ add_action( 'init', [ $this, 'init' ] );
+ add_action( 'wp_china_yes_monitor_hook', [
+ $this,
+ 'run_monitor'
+ ] );
+ }
+ } else {
+ wp_clear_scheduled_hook( 'wp_china_yes_monitor' );
}
-
- add_action( 'init', [ $this, 'init' ] );
- add_action( 'wp_china_yes_maybe_check_store', [
- $this,
- 'maybe_check_store'
- ] );
- add_action( 'wp_china_yes_maybe_check_cravatar', [
- $this,
- 'maybe_check_cravatar'
- ] );
- add_action( 'wp_china_yes_maybe_check_admincdn', [
- $this,
- 'maybe_check_admincdn'
- ] );
}
/**
* 初始化
*/
public function init() {
- // 检查应用市场可用性
- if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_store' ) && $this->settings['store'] != 'off' ) {
- wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_store' );
+ if ( ! wp_next_scheduled( 'wp_china_yes_monitor' ) ) {
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_monitor_hook' );
}
- // 检查初认头像可用性
- if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_cravatar' ) && $this->settings['cravatar'] != 'off' ) {
- wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_cravatar' );
+ }
+
+ /**
+ * 运行监控
+ */
+ public function run_monitor() {
+ if ( $this->settings['store'] != 'off' ) {
+ $this->maybe_check_store();
}
- // 检查萌芽加速可用性
- if ( ! wp_next_scheduled( 'wp_china_yes_maybe_check_admincdn' ) && ! empty( $this->settings['admincdn'] ) ) {
- wp_schedule_event( time(), 'hourly', 'wp_china_yes_maybe_check_admincdn' );
+ if ( $this->settings['cravatar'] != 'off' ) {
+ $this->maybe_check_cravatar();
+ }
+ if ( ! empty( $this->settings['admincdn'] ) ) {
+ $this->maybe_check_admincdn();
}
}
@@ -105,7 +109,7 @@ class Monitor {
public function maybe_check_admincdn() {
// 后台加速
if ( in_array( 'admin', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://wpstatic.admincdn.com/6.4.3/wp-includes/js/wp-sanitize.min.js' );
+ $response = wp_remote_get( 'https://wpstatic.admincdn.com/6.7/wp-includes/js/wp-sanitize.min.js' );
if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
$this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'admin' ] ) );
$this->update_settings();
@@ -161,7 +165,7 @@ class Monitor {
if ( is_multisite() ) {
update_site_option( 'wp_china_yes', $this->settings );
} else {
- update_option( 'wp_china_yes', $this->settings );
+ update_option( 'wp_china_yes', $this->settings, true );
}
}
}
diff --git a/Service/Super.php b/Service/Super.php
index 73c5832..c0e10d0 100644
--- a/Service/Super.php
+++ b/Service/Super.php
@@ -54,10 +54,10 @@ HTML;
支持论坛
|
翻译平台
- |
-
文章投稿
|
-
自选新闻源
+
文章投稿
+ |
+
自选新闻源
HTML;
diff --git a/composer.lock b/composer.lock
index 6066563..55fa2ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "yahnis-elsts/plugin-update-checker",
- "version": "v5.4",
+ "version": "v5.5",
"source": {
"type": "git",
"url": "https://github.com/YahnisElsts/plugin-update-checker.git",
- "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715"
+ "reference": "845d65da93bcff31649ede00d9d73b1beadbb7f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/e8e53e6d98e37fa7c895c93417f52e3775494715",
- "reference": "e8e53e6d98e37fa7c895c93417f52e3775494715",
+ "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/845d65da93bcff31649ede00d9d73b1beadbb7f0",
+ "reference": "845d65da93bcff31649ede00d9d73b1beadbb7f0",
"shasum": ""
},
"require": {
@@ -27,7 +27,7 @@
"type": "library",
"autoload": {
"files": [
- "load-v5p4.php"
+ "load-v5p5.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -52,9 +52,9 @@
],
"support": {
"issues": "https://github.com/YahnisElsts/plugin-update-checker/issues",
- "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.4"
+ "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.5"
},
- "time": "2024-02-24T09:56:49+00:00"
+ "time": "2024-10-16T14:25:00+00:00"
}
],
"packages-dev": [],
diff --git a/framework/classes/admin-options.class.php b/framework/classes/admin-options.class.php
index 9c250aa..3a9cb9d 100644
--- a/framework/classes/admin-options.class.php
+++ b/framework/classes/admin-options.class.php
@@ -346,7 +346,7 @@ if ( ! class_exists( 'WP_CHINA_YES_Options' ) ) {
} else if ( $this->args['database'] === 'network' ) {
update_site_option( $this->unique, $data );
} else {
- update_option( $this->unique, $data );
+ update_option( $this->unique, $data, true );
}
do_action( "wp_china_yes_{$this->unique}_saved", $data, $this );
diff --git a/framework/functions/actions.php b/framework/functions/actions.php
index b18ed96..f22a70e 100644
--- a/framework/functions/actions.php
+++ b/framework/functions/actions.php
@@ -115,7 +115,7 @@ if ( ! function_exists( 'wp_china_yes_import_ajax' ) ) {
}
// Success
- update_option( $unique, $data );
+ update_option( $unique, $data, true );
wp_send_json_success();
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 278cb81..7db8452 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -4,7 +4,7 @@
* Description: 文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，生生不息。
* Author: 文派开源
* Author URI: https://wp-china-yes.com
- * Version: 3.7.0
+ * Version: 3.7.1
* License: GPLv3 or later
* Text Domain: wp-china-yes
* Domain Path: /languages
From adb8efd3207ddbac5366f35a51f93d548e591322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Tue, 19 Nov 2024 18:12:56 +0800
Subject: [PATCH 36/54] =?UTF-8?q?feat:=20=E6=8F=90=E5=8D=87=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Monitor.php | 4 ++--
wp-china-yes.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Service/Monitor.php b/Service/Monitor.php
index 73fb085..efb8c63 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -24,7 +24,7 @@ class Monitor {
// 站点网络下只在主站运行
if ( is_main_site() ) {
add_action( 'init', [ $this, 'init' ] );
- add_action( 'wp_china_yes_monitor_hook', [
+ add_action( 'wp_china_yes_monitor', [
$this,
'run_monitor'
] );
@@ -39,7 +39,7 @@ class Monitor {
*/
public function init() {
if ( ! wp_next_scheduled( 'wp_china_yes_monitor' ) ) {
- wp_schedule_event( time(), 'hourly', 'wp_china_yes_monitor_hook' );
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_monitor' );
}
}
diff --git a/wp-china-yes.php b/wp-china-yes.php
index 7db8452..1cdd69e 100644
--- a/wp-china-yes.php
+++ b/wp-china-yes.php
@@ -19,7 +19,7 @@ namespace WenPai\ChinaYes;
defined( 'ABSPATH' ) || exit;
-define( 'CHINA_YES_VERSION', '3.7.0' );
+define( 'CHINA_YES_VERSION', '3.7.1' );
define( 'CHINA_YES_PLUGIN_FILE', __FILE__ );
define( 'CHINA_YES_PLUGIN_URL', plugin_dir_url( CHINA_YES_PLUGIN_FILE ) );
define( 'CHINA_YES_PLUGIN_PATH', plugin_dir_path( CHINA_YES_PLUGIN_FILE ) );
From 435ffd698025356ead759a2aee4fc16c4efab0b2 Mon Sep 17 00:00:00 2001
From: devhaozi
Date: Tue, 19 Nov 2024 10:19:27 +0000
Subject: [PATCH 37/54] docs: Update CHANGELOG
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d10811..d8c5dfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
All notable changes to `WP-China-Yes` will be documented in this file.
+## v3.7.1 - 2024-11-19
+
+1. 性能优化
+2. 修复监控无法关闭的问题
+
+**Full Changelog**: https://github.com/WenPai-org/wp-china-yes/compare/v3.6.5...v3.7.1
+
## v3.6.5 - 2024-08-23
1. 优化 CLI 判断
From 25fdf04fcc342851622f8065ed46ce1a3da09a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Sun, 8 Dec 2024 02:50:27 +0800
Subject: [PATCH 38/54] feat: check hook before clear
---
Service/Monitor.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Service/Monitor.php b/Service/Monitor.php
index efb8c63..b2be08e 100644
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -30,7 +30,9 @@ class Monitor {
] );
}
} else {
- wp_clear_scheduled_hook( 'wp_china_yes_monitor' );
+ if ( wp_get_scheduled_event( 'wp_china_yes_monitor' ) ) {
+ wp_clear_scheduled_hook( 'wp_china_yes_monitor' );
+ }
}
}
From a500ff9b6de5953c6d48171bfcf2cc7262af91b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?=
Date: Thu, 12 Dec 2024 23:58:22 +0800
Subject: [PATCH 39/54] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8fa5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Service/Setting.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/Service/Setting.php b/Service/Setting.php
index 80d7fc7..39903d9 100644
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -19,7 +19,6 @@ class Setting {
public function __construct() {
$this->settings = get_settings();
add_filter( 'wp_china_yes_enqueue_assets', '__return_true' );
- add_filter( 'wp_china_yes_fa4', '__return_true' );
add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_assets' ] );
add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', [ $this, 'admin_menu' ] );
self::admin_init();
From f2a89c42daa9dd41265486e2d0c16ce3bebc734d Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 12:06:40 +0800
Subject: [PATCH 40/54] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=96=B0=20UI=20?=
=?UTF-8?q?=E5=8F=8A=E5=9F=9F=E5=90=8D=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
更新域名wp-china-yes.com 到 wpcy.com
---
Service/Setting.php | 182 +++++++++--------
assets/css/fonts.css | 0
assets/css/setting.css | 336 ++++++++++++++++++++++++++++---
assets/images/website-banner.jpg | Bin 0 -> 29467 bytes
wp-china-yes.php | 6 +-
5 files changed, 407 insertions(+), 117 deletions(-)
mode change 100644 => 100755 Service/Setting.php
mode change 100644 => 100755 assets/css/fonts.css
mode change 100644 => 100755 assets/css/setting.css
create mode 100755 assets/images/website-banner.jpg
mode change 100644 => 100755 wp-china-yes.php
diff --git a/Service/Setting.php b/Service/Setting.php
old mode 100644
new mode 100755
index 39903d9..376bbc6
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -19,6 +19,7 @@ class Setting {
public function __construct() {
$this->settings = get_settings();
add_filter( 'wp_china_yes_enqueue_assets', '__return_true' );
+ add_filter( 'wp_china_yes_fa4', '__return_true' );
add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_assets' ] );
add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', [ $this, 'admin_menu' ] );
self::admin_init();
@@ -46,9 +47,23 @@ class Setting {
'database' => is_multisite() ? 'network' : '',
] );
+ WP_CHINA_YES::createSection( $this->prefix, [
+ 'title' => '欢迎使用',
+ 'icon' => 'icon icon-home-1',
+ 'fields' => [
+ [
+ 'type' => 'content',
+ 'content' =>
+ << 原生体验
文派叶子🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。
特色功能
* 100% 兼容 WP 程序及发行分支版本，更多优秀插件待您体验。
网站加速
优化加速插件多如牛毛，为何文派叶子如此与众不同？
进一步了解 ↗ 翻译推送
高质量翻译中文本地化翻译由文派开源官方提供，欢迎参与改进。
本地化改进 ↗ 加入我们
关注文派茶馆 WPTEA.com 公众号以及订阅我们的时事通讯即可接收独家内容、提示和更新。
将您的 WordPress 接入本土生态体系，这将为您提供一个更贴近中国人使用习惯的 WordPress。',
+ 'content' => '启用隐藏设置前请务必的保存或收藏当前设置页面 URL，否则您将无法再次进入插件设置页面',
],
+ ],
+ ] );
+
+
+ WP_CHINA_YES::createSection( $this->prefix, [
+ 'title' => '其他设置',
+ 'icon' => 'icon icon-setting',
+ 'fields' => [
[
- 'type' => 'subheading',
- 'content' => '赞助商',
- ],
- [
- 'type' => 'submessage',
- 'content' => '特别感谢以下企业品牌对文派项目提供的资金资源，同时期待社会各界参与。',
+ 'id' => 'hide',
+ 'type' => 'switcher',
+ 'default' => false,
+ 'title' => '隐藏设置',
+ 'subtitle' => '隐藏插件设置入口',
+ 'desc' => __( '如果您不希望让客户知道本站启用了文派叶子🍃（WP-China-Yes）插件及服务，可开启此选项',
+ 'wp-china-yes' ),
],
+ ],
+ ] );
+
+
+ WP_CHINA_YES::createSection( $this->prefix, [
+ 'title' => '建站套件',
+ 'icon' => 'icon icon-mouse',
+ 'fields' => [
[
'type' => 'content',
'content' =>
<<
+ 开源建站
文派寻鹿🦌（WP Deer）建站套件是由文派科技官方提供的企业建站产品集合，代码均为 100% GPL 开源，无任何加密隐藏。
+
项目简介
文派（WordPress）中国本土化项目始于 2019 年，由 文派叶子🍃（WPCY） 插件开启，其前身为 WP-China-Yes。
+
+
2023 年 5 月，文派科技完成对该项目的收购，并对其进行了全面的品牌重塑。
+
赞助支持
特别感谢以下企业品牌对文派项目提供的资金资源支持。早期伙伴未来有机会共享文派生态资源，期待社会各界参与。
-HTML,
- ],
- [
- 'type' => 'subheading',
- 'content' => '开发者 & 贡献者',
- ],
- [
- 'type' => 'submessage',
- 'content' => '以下为对此项目提供过帮助的朋友，欢迎
贡献您自己的力量。',
- ],
- [
- 'type' => 'content',
- 'content' =>
- <<
-
孙锡源 |
-
耗子 |
-
Yulinn |
-
赵丰 |
-
jialong Dong |
-
TigerKK |
-
xianyu125 |
-
ElliotHughes |
-
诗语 |
-
莫蒂奇 |
-
薇晓朵
-
+
开发 & 贡献者
100% 开源代码，诚邀您一起参与文派 （WordPress） 软件国产化进程，打造属于自己的开源自助建站程序。
+
From 33e05459654bb2ae731d1b2f8a086f24ec503255 Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 12:34:21 +0800
Subject: [PATCH 43/54] Update readme.md
---
readme.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/readme.md b/readme.md
index dca2c28..871eb5f 100644
--- a/readme.md
+++ b/readme.md
@@ -33,5 +33,5 @@
## 赞助商
-
+
From 9ea04f6ac47c7692871035abd8929d22dcb01cb7 Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 12:50:20 +0800
Subject: [PATCH 44/54] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20iconsax=20=E5=9B=BE?=
=?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
framework/classes/setup.class.php | 4 ++++
1 file changed, 4 insertions(+)
mode change 100644 => 100755 framework/classes/setup.class.php
diff --git a/framework/classes/setup.class.php b/framework/classes/setup.class.php
old mode 100644
new mode 100755
index 4742edb..dbd55d2
--- a/framework/classes/setup.class.php
+++ b/framework/classes/setup.class.php
@@ -577,6 +577,10 @@ if ( ! class_exists( 'WP_CHINA_YES_Setup' ) ) {
wp_enqueue_style( 'wp_china_yes-fa5-v4-shims', 'https://jsd.admincdn.com/npm/@fortawesome/fontawesome-free@5.15.4/css/v4-shims.min.css', array(), '5.15.5', 'all' );
}
+ // Iconsax font icon loader
+ wp_enqueue_style( 'wp_china_yes-iconsax', 'https://jsd.admincdn.com/npm/iconsax-font-icon@1.1.0/dist/icons.min.css', array(), '1.1.0', 'all' );
+
+
// Check for developer mode
$min = ( self::$premium && SCRIPT_DEBUG ) ? '' : '.min';
From fdce4da05e54842dcb90247587adc26ea202961d Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 13:07:24 +0800
Subject: [PATCH 45/54] Update readme.md
---
readme.md | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/readme.md b/readme.md
index 871eb5f..b7893bb 100644
--- a/readme.md
+++ b/readme.md
@@ -2,9 +2,12 @@
文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，生生不息。
+
+
+
## 简介
-文派叶子 🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
+文派叶子 🍃（WPCY）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
## 功能
@@ -16,6 +19,14 @@
- [x] 优化 谷歌字体 加载速度
- [x] 优化 谷歌前端库 加载速度
- [x] 优化 CDNJS 加载速度
+- [x] 优化 Jsdelivr 加载速度
+- [x] 集成 WPMirror 镜像更新源
+- [x] 集成 Windfonts 中文网页 Webfonts [文风字体](https://windfonts.com)
+- [x] 集成 adminCDN 前端公共库[文风字体](https://windfonts.com)
+- [x] 启用 飞行模式 可屏蔽外部 API 请求
+- [x] 启用 节点监控 可自动切换加速节点
+- [x] 启用 品牌白标 可自定义 OEM 插件品牌
+
## 安装
@@ -33,5 +44,4 @@
## 赞助商
-
-
+
From 7e08f3392336d5cd01c26a3af15627bc040d6657 Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 13:10:25 +0800
Subject: [PATCH 46/54] Update readme.md
---
readme.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/readme.md b/readme.md
index b7893bb..1fe546b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,12 +1,13 @@
# WP-China-Yes
+开源 WordPress 中国网站加速器。
+
文派叶子 🍃（WP-China-Yes）是中国 WordPress 生态基础设施软件，犹如落叶新芽，生生不息。
## 简介
-
文派叶子 🍃（WPCY）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。项目起源于 2019 年，专为解决困扰了中国互联网数十年的特色问题而存在。此为文派开源（WenPai.org）的一部分。
## 功能
@@ -22,7 +23,7 @@
- [x] 优化 Jsdelivr 加载速度
- [x] 集成 WPMirror 镜像更新源
- [x] 集成 Windfonts 中文网页 Webfonts [文风字体](https://windfonts.com)
-- [x] 集成 adminCDN 前端公共库[文风字体](https://windfonts.com)
+- [x] 集成 adminCDN 前端公共库[萌芽加速](https://admincdn.com)
- [x] 启用 飞行模式 可屏蔽外部 API 请求
- [x] 启用 节点监控 可自动切换加速节点
- [x] 启用 品牌白标 可自定义 OEM 插件品牌
From 8d3a71414d1fc4a8c5983a8fa29ab66539a4a5c2 Mon Sep 17 00:00:00 2001
From: feng
Date: Sat, 21 Dec 2024 13:11:29 +0800
Subject: [PATCH 47/54] Update readme.md
---
readme.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/readme.md b/readme.md
index 1fe546b..fd4c790 100644
--- a/readme.md
+++ b/readme.md
@@ -16,14 +16,14 @@
- [x] 优化 WordPress 后台加载速度
- [x] 优化 WordPress 前台加载速度
- [x] 移除后台无用请求与组件
-- [x] 替换 Gravatar 头像为[初认头像](https://cravatar.com/)
+- [x] 替换 Gravatar 头像为 Cravatar [初认头像](https://cravatar.com/)
- [x] 优化 谷歌字体 加载速度
- [x] 优化 谷歌前端库 加载速度
- [x] 优化 CDNJS 加载速度
- [x] 优化 Jsdelivr 加载速度
- [x] 集成 WPMirror 镜像更新源
- [x] 集成 Windfonts 中文网页 Webfonts [文风字体](https://windfonts.com)
-- [x] 集成 adminCDN 前端公共库[萌芽加速](https://admincdn.com)
+- [x] 集成 adminCDN 前端公共库 [萌芽加速](https://admincdn.com)
- [x] 启用 飞行模式 可屏蔽外部 API 请求
- [x] 启用 节点监控 可自动切换加速节点
- [x] 启用 品牌白标 可自定义 OEM 插件品牌
From 5370b07c366d813543337907c58c1673495ac286 Mon Sep 17 00:00:00 2001
From: feng
Date: Thu, 2 Jan 2025 10:36:40 +0800
Subject: [PATCH 48/54] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=87=B3=203.8=20?=
=?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Plugin.php | 2 +-
Service/Base.php | 6 +-
Service/Memory.php | 254 ++++
Service/Monitor.php | 344 +++--
Service/Setting.php | 138 +-
Service/Super.php | 59 +-
Service/Update.php | 0
assets/css/setting.css | 3 +
assets/images/qr-banner.jpg | Bin 0 -> 48213 bytes
assets/images/website-banner.jpg | Bin 29467 -> 48110 bytes
framework/assets/css/style-rtl.min.css | 0
framework/assets/css/style.min.css | 0
framework/assets/images/checkerboard.png | Bin
framework/assets/images/wp-logo.svg | 0
framework/assets/images/wp-plugin-logo.svg | 0
framework/assets/js/main.min.js | 0
framework/assets/js/plugins.min.js | 0
framework/classes/abstract.class.php | 0
framework/classes/admin-options.class.php | 0
framework/classes/fields.class.php | 0
framework/fields/accordion/accordion.php | 0
framework/fields/background/background.php | 0
framework/fields/backup/backup.php | 0
framework/fields/border/border.php | 0
framework/fields/button_set/button_set.php | 0
framework/fields/callback/callback.php | 0
framework/fields/checkbox/checkbox.php | 0
framework/fields/code_editor/code_editor.php | 0
framework/fields/color/color.php | 0
framework/fields/color_group/color_group.php | 0
framework/fields/content/content.php | 0
framework/fields/date/date.php | 0
framework/fields/datetime/datetime.php | 0
framework/fields/dimensions/dimensions.php | 0
framework/fields/fieldset/fieldset.php | 0
framework/fields/gallery/gallery.php | 0
framework/fields/group/group.php | 0
framework/fields/heading/heading.php | 0
framework/fields/icon/fa4-icons.php | 0
framework/fields/icon/fa5-icons.php | 0
framework/fields/icon/icon.php | 0
.../fields/image_select/image_select.php | 0
framework/fields/index.php | 0
framework/fields/link/link.php | 0
framework/fields/link_color/link_color.php | 0
framework/fields/map/map.php | 0
framework/fields/media/media.php | 0
framework/fields/notice/notice.php | 0
framework/fields/number/number.php | 0
framework/fields/palette/palette.php | 0
framework/fields/radio/radio.php | 0
framework/fields/repeater/repeater.php | 0
framework/fields/select/select.php | 0
framework/fields/slider/slider.php | 0
framework/fields/sortable/sortable.php | 0
framework/fields/sorter/sorter.php | 0
framework/fields/spacing/spacing.php | 0
framework/fields/spinner/spinner.php | 0
framework/fields/subheading/subheading.php | 0
framework/fields/submessage/submessage.php | 0
framework/fields/switcher/switcher.php | 0
framework/fields/tabbed/tabbed.php | 0
framework/fields/text/text.php | 0
framework/fields/textarea/textarea.php | 0
framework/fields/typography/google-fonts.php | 0
framework/fields/typography/typography.php | 0
framework/fields/upload/upload.php | 0
framework/fields/wp_editor/wp_editor.php | 0
framework/functions/actions.php | 0
framework/functions/customize.php | 0
framework/functions/helpers.php | 0
framework/functions/sanitize.php | 0
framework/functions/validate.php | 0
framework/functions/walker.php | 0
framework/index.php | 0
framework/languages/zh_CN.mo | Bin
framework/languages/zh_CN.po | 1344 ++++++++---------
helpers.php | 1 +
78 files changed, 1261 insertions(+), 890 deletions(-)
mode change 100644 => 100755 Plugin.php
mode change 100644 => 100755 Service/Base.php
create mode 100755 Service/Memory.php
mode change 100644 => 100755 Service/Monitor.php
mode change 100644 => 100755 Service/Super.php
mode change 100644 => 100755 Service/Update.php
create mode 100755 assets/images/qr-banner.jpg
mode change 100644 => 100755 framework/assets/css/style-rtl.min.css
mode change 100644 => 100755 framework/assets/css/style.min.css
mode change 100644 => 100755 framework/assets/images/checkerboard.png
mode change 100644 => 100755 framework/assets/images/wp-logo.svg
mode change 100644 => 100755 framework/assets/images/wp-plugin-logo.svg
mode change 100644 => 100755 framework/assets/js/main.min.js
mode change 100644 => 100755 framework/assets/js/plugins.min.js
mode change 100644 => 100755 framework/classes/abstract.class.php
mode change 100644 => 100755 framework/classes/admin-options.class.php
mode change 100644 => 100755 framework/classes/fields.class.php
mode change 100644 => 100755 framework/fields/accordion/accordion.php
mode change 100644 => 100755 framework/fields/background/background.php
mode change 100644 => 100755 framework/fields/backup/backup.php
mode change 100644 => 100755 framework/fields/border/border.php
mode change 100644 => 100755 framework/fields/button_set/button_set.php
mode change 100644 => 100755 framework/fields/callback/callback.php
mode change 100644 => 100755 framework/fields/checkbox/checkbox.php
mode change 100644 => 100755 framework/fields/code_editor/code_editor.php
mode change 100644 => 100755 framework/fields/color/color.php
mode change 100644 => 100755 framework/fields/color_group/color_group.php
mode change 100644 => 100755 framework/fields/content/content.php
mode change 100644 => 100755 framework/fields/date/date.php
mode change 100644 => 100755 framework/fields/datetime/datetime.php
mode change 100644 => 100755 framework/fields/dimensions/dimensions.php
mode change 100644 => 100755 framework/fields/fieldset/fieldset.php
mode change 100644 => 100755 framework/fields/gallery/gallery.php
mode change 100644 => 100755 framework/fields/group/group.php
mode change 100644 => 100755 framework/fields/heading/heading.php
mode change 100644 => 100755 framework/fields/icon/fa4-icons.php
mode change 100644 => 100755 framework/fields/icon/fa5-icons.php
mode change 100644 => 100755 framework/fields/icon/icon.php
mode change 100644 => 100755 framework/fields/image_select/image_select.php
mode change 100644 => 100755 framework/fields/index.php
mode change 100644 => 100755 framework/fields/link/link.php
mode change 100644 => 100755 framework/fields/link_color/link_color.php
mode change 100644 => 100755 framework/fields/map/map.php
mode change 100644 => 100755 framework/fields/media/media.php
mode change 100644 => 100755 framework/fields/notice/notice.php
mode change 100644 => 100755 framework/fields/number/number.php
mode change 100644 => 100755 framework/fields/palette/palette.php
mode change 100644 => 100755 framework/fields/radio/radio.php
mode change 100644 => 100755 framework/fields/repeater/repeater.php
mode change 100644 => 100755 framework/fields/select/select.php
mode change 100644 => 100755 framework/fields/slider/slider.php
mode change 100644 => 100755 framework/fields/sortable/sortable.php
mode change 100644 => 100755 framework/fields/sorter/sorter.php
mode change 100644 => 100755 framework/fields/spacing/spacing.php
mode change 100644 => 100755 framework/fields/spinner/spinner.php
mode change 100644 => 100755 framework/fields/subheading/subheading.php
mode change 100644 => 100755 framework/fields/submessage/submessage.php
mode change 100644 => 100755 framework/fields/switcher/switcher.php
mode change 100644 => 100755 framework/fields/tabbed/tabbed.php
mode change 100644 => 100755 framework/fields/text/text.php
mode change 100644 => 100755 framework/fields/textarea/textarea.php
mode change 100644 => 100755 framework/fields/typography/google-fonts.php
mode change 100644 => 100755 framework/fields/typography/typography.php
mode change 100644 => 100755 framework/fields/upload/upload.php
mode change 100644 => 100755 framework/fields/wp_editor/wp_editor.php
mode change 100644 => 100755 framework/functions/actions.php
mode change 100644 => 100755 framework/functions/customize.php
mode change 100644 => 100755 framework/functions/helpers.php
mode change 100644 => 100755 framework/functions/sanitize.php
mode change 100644 => 100755 framework/functions/validate.php
mode change 100644 => 100755 framework/functions/walker.php
mode change 100644 => 100755 framework/index.php
mode change 100644 => 100755 framework/languages/zh_CN.mo
mode change 100644 => 100755 framework/languages/zh_CN.po
mode change 100644 => 100755 helpers.php
diff --git a/Plugin.php b/Plugin.php
old mode 100644
new mode 100755
index 4723162..c7801a3
--- a/Plugin.php
+++ b/Plugin.php
@@ -45,7 +45,7 @@ class Plugin {
*/
add_filter( sprintf( '%splugin_action_links', is_multisite() ? 'network_admin_' : '' ), function ( $links, $plugin = '' ) {
$links[] = '参与翻译';
- $links[] = '去广告';
+ $links[] = '去广告';
return $links;
}, 10, 2 );
diff --git a/Service/Base.php b/Service/Base.php
old mode 100644
new mode 100755
index 5938a15..4da50cc
--- a/Service/Base.php
+++ b/Service/Base.php
@@ -16,11 +16,13 @@ class Base {
new Super();
// 监控服务
new Monitor();
+ // 内存服务
+ new Memory();
// 更新服务
new Update();
if ( is_admin() ) {
- // 设置服务
- new Setting();
+ // 设置服务
+ new Setting();
}
}
}
diff --git a/Service/Memory.php b/Service/Memory.php
new file mode 100755
index 0000000..23a1115
--- /dev/null
+++ b/Service/Memory.php
@@ -0,0 +1,254 @@
+' . __('WP_DEBUG', 'wp-china-yes') . '';
+ }
+ return '' . __('WP_DEBUG', 'wp-china-yes') . '';
+ }
+
+ /**
+ * 获取 CPU 使用率
+ */
+ private function get_cpu_usage() {
+ if (function_exists('sys_getloadavg') && is_callable('sys_getloadavg')) {
+ $load = sys_getloadavg();
+ return round($load[0] * 100 / 4, 2); // 假设是4核CPU
+ }
+ return false;
+ }
+
+ /**
+ * 获取 MySQL 版本
+ */
+ private function get_mysql_version() {
+ global $wpdb;
+ return $wpdb->get_var("SELECT VERSION()");
+ }
+
+ /**
+ * 检查 PHP 内存限制
+ */
+ public function check_memory_limit() {
+ $this->memory['limit'] = (int) ini_get('memory_limit');
+ }
+
+ /**
+ * 检查内存使用情况
+ */
+ private function check_memory_usage() {
+ $this->memory['usage'] = function_exists('memory_get_peak_usage')
+ ? round(memory_get_peak_usage(true) / 1024 / 1024, 2)
+ : 0;
+
+ if (!empty($this->memory['usage']) && !empty($this->memory['limit'])) {
+ $this->memory['percent'] = round($this->memory['usage'] / $this->memory['limit'] * 100, 0);
+ $this->memory['color'] = $this->get_memory_color($this->memory['percent']);
+ }
+ }
+
+ /**
+ * 获取内存使用率的颜色
+ */
+ private function get_memory_color($percent) {
+ if ($percent > 90) {
+ return 'font-weight:bold;color:red';
+ } elseif ($percent > 75) {
+ return 'font-weight:bold;color:#E66F00';
+ }
+ return 'font-weight:normal;';
+ }
+
+ /**
+ * 格式化 WordPress 内存限制
+ */
+ private function format_wp_limit($size) {
+ $unit = strtoupper(substr($size, -1));
+ $value = (int) substr($size, 0, -1);
+
+ switch ($unit) {
+ case 'P': $value *= 1024;
+ case 'T': $value *= 1024;
+ case 'G': $value *= 1024;
+ case 'M': $value *= 1024;
+ case 'K': $value *= 1024;
+ }
+ return $value;
+ }
+
+ /**
+ * 获取 WordPress 内存限制
+ */
+ private function check_wp_limit() {
+ $memory = $this->format_wp_limit(WP_MEMORY_LIMIT);
+ return $memory ? size_format($memory) : __('N/A', 'wp-china-yes');
+ }
+
+ /**
+ * 添加信息到管理界面页脚
+ */
+public function add_footer($content) {
+ $settings = get_settings();
+ // 确保 memory_display 是数组，如果不是则使用空数组
+ $display_options = is_array($settings['memory_display'] ?? []) ? $settings['memory_display'] : [];
+
+ // 如果 memory 设置未启用，直接返回原始内容
+ if (empty($settings['memory'])) {
+ return $content;
+ }
+
+ $this->check_memory_usage();
+ $this->server_ip_address = $_SERVER['SERVER_ADDR'] ?? ($_SERVER['LOCAL_ADDR'] ?? '');
+ $this->os_info = $this->get_os_info();
+
+ $footer_parts = [];
+
+ // 内存使用量
+ if (in_array('memory_usage', $display_options)) {
+ $footer_parts[] = sprintf('%s: %s %s %s MB (%s%%)',
+ __('Memory', 'wp-china-yes'),
+ $this->memory['usage'],
+ __('of', 'wp-china-yes'),
+ $this->memory['limit'],
+ $this->memory['color'],
+ $this->memory['percent']
+ );
+ }
+
+ // WP内存限制
+ if (in_array('wp_limit', $display_options)) {
+ $footer_parts[] = sprintf('%s: %s',
+ __('WP LIMIT', 'wp-china-yes'),
+ $this->check_wp_limit()
+ );
+ }
+
+ // 服务器IP和主机名
+ if (in_array('server_ip', $display_options)) {
+ $hostname_part = in_array('hostname', $display_options) ? " (" . gethostname() . ")" : "";
+ $footer_parts[] = sprintf('IP: %s%s',
+ $this->server_ip_address,
+ $hostname_part
+ );
+ }
+
+ // 操作系统信息
+ if (in_array('os_info', $display_options)) {
+ $footer_parts[] = sprintf('OS: %s', $this->os_info);
+ }
+
+ // PHP信息
+ if (in_array('php_info', $display_options)) {
+ $footer_parts[] = sprintf('PHP: %s @%sBitOS',
+ PHP_VERSION,
+ PHP_INT_SIZE * 8
+ );
+ }
+
+ // Debug状态
+ if (in_array('debug_status', $display_options)) {
+ $footer_parts[] = $this->get_debug_status();
+ }
+
+ // CPU使用率
+ if (in_array('cpu_usage', $display_options)) {
+ $cpu_usage = $this->get_cpu_usage();
+ if ($cpu_usage !== false) {
+ $footer_parts[] = sprintf('CPU: %s%%', $cpu_usage);
+ }
+ }
+
+ // MySQL版本
+ if (in_array('mysql_version', $display_options)) {
+ $footer_parts[] = sprintf('MySQL: %s', $this->get_mysql_version());
+ }
+
+ if (!empty($footer_parts)) {
+ $content .= ' | WPCY - ' . implode(' | ', $footer_parts);
+ }
+
+ return $content;
+}
+
+
+ /**
+ * 检查 PHP 版本
+ */
+ public function check_php_version() {
+ if (version_compare(PHP_VERSION, '7.0', '<')) {
+ deactivate_plugins(plugin_basename(CHINA_YES_PLUGIN_FILE));
+ wp_die(
+ sprintf(
+ '%s
%s
',
+ __('插件无法激活：PHP 版本过低', 'wp-china-yes'),
+ __('请升级 PHP 至 7.0 或更高版本。', 'wp-china-yes')
+ ),
+ __('PHP 版本错误', 'wp-china-yes'),
+ ['back_link' => true]
+ );
+ }
+ }
+}
diff --git a/Service/Monitor.php b/Service/Monitor.php
old mode 100644
new mode 100755
index b2be08e..c6d3b44
--- a/Service/Monitor.php
+++ b/Service/Monitor.php
@@ -1,173 +1,171 @@
-settings = get_settings();
- wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_store' ); // TODO 下个版本移除
- wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_cravatar' ); // TODO 下个版本移除
- wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_admincdn' ); // TODO 下个版本移除
- if ( $this->settings['monitor'] ) {
- // 站点网络下只在主站运行
- if ( is_main_site() ) {
- add_action( 'init', [ $this, 'init' ] );
- add_action( 'wp_china_yes_monitor', [
- $this,
- 'run_monitor'
- ] );
- }
- } else {
- if ( wp_get_scheduled_event( 'wp_china_yes_monitor' ) ) {
- wp_clear_scheduled_hook( 'wp_china_yes_monitor' );
- }
- }
- }
-
- /**
- * 初始化
- */
- public function init() {
- if ( ! wp_next_scheduled( 'wp_china_yes_monitor' ) ) {
- wp_schedule_event( time(), 'hourly', 'wp_china_yes_monitor' );
- }
- }
-
- /**
- * 运行监控
- */
- public function run_monitor() {
- if ( $this->settings['store'] != 'off' ) {
- $this->maybe_check_store();
- }
- if ( $this->settings['cravatar'] != 'off' ) {
- $this->maybe_check_cravatar();
- }
- if ( ! empty( $this->settings['admincdn'] ) ) {
- $this->maybe_check_admincdn();
- }
- }
-
- /**
- * 检查应用市场可用性
- */
- public function maybe_check_store() {
- $test_url = 'https://api.wenpai.net/china-yes/version-check';
- if ( $this->settings['store'] == 'proxy' ) {
- $test_url = 'https://api.wpmirror.com/core/version-check/1.7/';
- }
- $response = wp_remote_get( $test_url );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- if ( $this->settings['store'] == 'wenpai' ) {
- $this->settings['store'] = 'proxy';
- } elseif ( $this->settings['store'] == 'proxy' ) {
- $this->settings['store'] = 'off';
- }
- $this->update_settings();
- }
- }
-
- /**
- * 检查初认头像可用性
- */
- public function maybe_check_cravatar() {
- $test_url = 'https://cn.cravatar.com/avatar/';
- switch ( $this->settings['cravatar'] ) {
- case 'global':
- $test_url = 'https://en.cravatar.com/avatar/';
- break;
- case 'weavatar':
- $test_url = 'https://weavatar.com/avatar/';
- break;
- }
- $response = wp_remote_get( $test_url );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- if ( $this->settings['cravatar'] == 'cn' ) {
- $this->settings['cravatar'] = 'global';
- } elseif ( $this->settings['cravatar'] == 'global' ) {
- $this->settings['cravatar'] = 'weavatar';
- } elseif ( $this->settings['cravatar'] == 'weavatar' ) {
- $this->settings['cravatar'] = 'cn';
- }
- $this->update_settings();
- }
- }
-
- /**
- * 检查萌芽加速可用性
- */
- public function maybe_check_admincdn() {
- // 后台加速
- if ( in_array( 'admin', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://wpstatic.admincdn.com/6.7/wp-includes/js/wp-sanitize.min.js' );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'admin' ] ) );
- $this->update_settings();
- }
- }
- // 前台加速
- if ( in_array( 'frontend', $this->settings['admincdn'] ) ) {
- $url = network_site_url( '/wp-includes/js/wp-sanitize.min.js' );
- $response = wp_remote_get( 'https://public.admincdn.com/' . $url );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'frontend' ] ) );
- $this->update_settings();
- }
- }
- // Google 字体
- if ( in_array( 'googlefonts', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://googlefonts.admincdn.com/css?family=Roboto:400,700' );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'googlefonts' ] ) );
- $this->update_settings();
- }
- }
- // Google 前端公共库
- if ( in_array( 'googleajax', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://googleajax.admincdn.com/ajax/libs/jquery/3.7.1/jquery.slim.min.js' );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'googleajax' ] ) );
- $this->update_settings();
- }
- }
- // CDNJS 前端公共库
- if ( in_array( 'cdnjs', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://cdnjs.admincdn.com/jquery/3.7.1/jquery.slim.min.js' );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'cdnjs' ] ) );
- $this->update_settings();
- }
- }
- // jsDelivr 公共库
- if ( in_array( 'jsdelivr', $this->settings['admincdn'] ) ) {
- $response = wp_remote_get( 'https://jsd.admincdn.com/npm/jquery@3.7.1/dist/jquery.slim.min.js' );
- if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
- $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'jsdelivr' ] ) );
- $this->update_settings();
- }
- }
- }
-
- /**
- * 更新设置
- */
- private function update_settings() {
- if ( is_multisite() ) {
- update_site_option( 'wp_china_yes', $this->settings );
- } else {
- update_option( 'wp_china_yes', $this->settings, true );
- }
- }
-}
+settings = get_settings();
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_store' ); // TODO 下个版本移除
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_cravatar' ); // TODO 下个版本移除
+ wp_clear_scheduled_hook( 'wp_china_yes_maybe_check_admincdn' ); // TODO 下个版本移除
+ if ( $this->settings['monitor'] ) {
+ // 站点网络下只在主站运行
+ if ( is_main_site() ) {
+ add_action( 'init', [ $this, 'init' ] );
+ add_action( 'wp_china_yes_monitor', [
+ $this,
+ 'run_monitor'
+ ] );
+ }
+ } else {
+ wp_clear_scheduled_hook( 'wp_china_yes_monitor' );
+ }
+ }
+
+ /**
+ * 初始化
+ */
+ public function init() {
+ if ( ! wp_next_scheduled( 'wp_china_yes_monitor' ) ) {
+ wp_schedule_event( time(), 'hourly', 'wp_china_yes_monitor' );
+ }
+ }
+
+ /**
+ * 运行监控
+ */
+ public function run_monitor() {
+ if ( $this->settings['store'] != 'off' ) {
+ $this->maybe_check_store();
+ }
+ if ( $this->settings['cravatar'] != 'off' ) {
+ $this->maybe_check_cravatar();
+ }
+ if ( ! empty( $this->settings['admincdn'] ) ) {
+ $this->maybe_check_admincdn();
+ }
+ }
+
+ /**
+ * 检查应用市场可用性
+ */
+ public function maybe_check_store() {
+ $test_url = 'https://api.wenpai.net/china-yes/version-check';
+ if ( $this->settings['store'] == 'proxy' ) {
+ $test_url = 'https://api.wpmirror.com/core/version-check/1.7/';
+ }
+ $response = wp_remote_get( $test_url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ if ( $this->settings['store'] == 'wenpai' ) {
+ $this->settings['store'] = 'proxy';
+ } elseif ( $this->settings['store'] == 'proxy' ) {
+ $this->settings['store'] = 'off';
+ }
+ $this->update_settings();
+ }
+ }
+
+ /**
+ * 检查初认头像可用性
+ */
+ public function maybe_check_cravatar() {
+ $test_url = 'https://cn.cravatar.com/avatar/';
+ switch ( $this->settings['cravatar'] ) {
+ case 'global':
+ $test_url = 'https://en.cravatar.com/avatar/';
+ break;
+ case 'weavatar':
+ $test_url = 'https://weavatar.com/avatar/';
+ break;
+ }
+ $response = wp_remote_get( $test_url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ if ( $this->settings['cravatar'] == 'cn' ) {
+ $this->settings['cravatar'] = 'global';
+ } elseif ( $this->settings['cravatar'] == 'global' ) {
+ $this->settings['cravatar'] = 'weavatar';
+ } elseif ( $this->settings['cravatar'] == 'weavatar' ) {
+ $this->settings['cravatar'] = 'cn';
+ }
+ $this->update_settings();
+ }
+ }
+
+ /**
+ * 检查萌芽加速可用性
+ */
+ public function maybe_check_admincdn() {
+ // 后台加速
+ if ( in_array( 'admin', $this->settings['admincdn'] ) ) {
+ $response = wp_remote_get( 'https://wpstatic.admincdn.com/6.7/wp-includes/js/wp-sanitize.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'admin' ] ) );
+ $this->update_settings();
+ }
+ }
+ // 前台加速
+ if ( in_array( 'frontend', $this->settings['admincdn'] ) ) {
+ $url = network_site_url( '/wp-includes/js/wp-sanitize.min.js' );
+ $response = wp_remote_get( 'https://public.admincdn.com/' . $url );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'frontend' ] ) );
+ $this->update_settings();
+ }
+ }
+ // Google 字体
+ if ( in_array( 'googlefonts', $this->settings['admincdn'] ) ) {
+ $response = wp_remote_get( 'https://googlefonts.admincdn.com/css?family=Roboto:400,700' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'googlefonts' ] ) );
+ $this->update_settings();
+ }
+ }
+ // Google 前端公共库
+ if ( in_array( 'googleajax', $this->settings['admincdn'] ) ) {
+ $response = wp_remote_get( 'https://googleajax.admincdn.com/ajax/libs/jquery/3.7.1/jquery.slim.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'googleajax' ] ) );
+ $this->update_settings();
+ }
+ }
+ // CDNJS 前端公共库
+ if ( in_array( 'cdnjs', $this->settings['admincdn'] ) ) {
+ $response = wp_remote_get( 'https://cdnjs.admincdn.com/jquery/3.7.1/jquery.slim.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'cdnjs' ] ) );
+ $this->update_settings();
+ }
+ }
+ // jsDelivr 公共库
+ if ( in_array( 'jsdelivr', $this->settings['admincdn'] ) ) {
+ $response = wp_remote_get( 'https://jsd.admincdn.com/npm/jquery@3.7.1/dist/jquery.slim.min.js' );
+ if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) != 200 ) {
+ $this->settings['admincdn'] = array_values( array_diff( $this->settings['admincdn'], [ 'jsdelivr' ] ) );
+ $this->update_settings();
+ }
+ }
+ }
+
+ /**
+ * 更新设置
+ */
+ private function update_settings() {
+ if ( is_multisite() ) {
+ update_site_option( 'wp_china_yes', $this->settings );
+ } else {
+ update_option( 'wp_china_yes', $this->settings, true );
+ }
+ }
+}
diff --git a/Service/Setting.php b/Service/Setting.php
index 376bbc6..99b06d0 100755
--- a/Service/Setting.php
+++ b/Service/Setting.php
@@ -25,6 +25,19 @@ class Setting {
self::admin_init();
}
+
+/**
+ * 动态获取设置页面的 URL
+ *
+ * @return string
+ */
+private function get_settings_page_url() {
+ if ( is_multisite() ) {
+ return network_admin_url( 'settings.php?page=wp-china-yes' );
+ }
+ return admin_url( 'options-general.php?page=wp-china-yes' );
+}
+
/**
* 挂载设置项
*/
@@ -55,7 +68,7 @@ class Setting {
'type' => 'content',
'content' =>
<< 原生体验
文派叶子🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。
特色功能
* 100% 兼容 WP 程序及发行分支版本，更多优秀插件待您体验。
网站加速
优化加速插件多如牛毛，为何文派叶子如此与众不同？
进一步了解 ↗ 翻译推送
高质量翻译中文本地化翻译由文派开源官方提供，欢迎参与改进。
本地化改进 ↗ 加入我们
关注文派茶馆 WPTEA.com 公众号以及订阅我们的时事通讯即可接收独家内容、提示和更新。
原生体验
文派叶子🍃（WP-China-Yes）是一款不可多得的 WordPress 系统底层优化和生态基础设施软件。
特色功能
* 100% 兼容 WP 程序及分支发行版本，更多优秀插件待您体验。
网站加速
优化加速插件多如牛毛，为何文派叶子如此与众不同？
进一步了解 ↗ 翻译推送
高质量翻译中文本地化翻译由文派开源官方提供，欢迎参与改进。
本地化改进 ↗ 加入我们
关注文派茶馆 WPTEA.com 公众号以及订阅我们的时事通讯即可接收独家内容、提示和更新。
开源建站
文派寻鹿🦌（WP Deer）建站套件是由文派科技官方提供的企业建站产品集合，代码均为 100% GPL 开源，无任何加密隐藏。
开源建站
文派寻鹿🦌（WP Deer）建站套件是由文派科技官方提供的企业建站产品集合，代码均为 100% GPL 开源，无任何加密隐藏。
项目简介
文派（WordPress）中国本土化项目始于 2019 年，由 文派叶子🍃（WPCY） 插件开启，其前身为 WP-China-Yes。
2023 年 5 月，文派科技完成对该项目的收购，并对其进行了全面的品牌重塑。
-
赞助支持
特别感谢以下企业品牌对文派项目提供的资金资源支持。早期伙伴未来有机会共享文派生态资源，期待社会各界参与。
赞助支持
特别感谢以下企业品牌对文派项目提供的资金资源支持。早期伙伴未来有机会共享文派生态资源，期待社会各界参与。
开发 & 贡献者
100% 开源代码，诚邀您一起参与文派 （WordPress） 软件国产化进程，打造属于自己的开源自助建站程序。
-
### 服务器及管理软件
-
-
-
-
-
+