From 46563f3a02ce8d3c60bb736ef4a9fa42817663b5 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 26 Aug 2020 17:24:57 +0800 Subject: [PATCH 001/120] =?UTF-8?q?=E6=96=87=E6=A1=A3:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B03.1.0-Beata1=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=BD=E9=99=85=E5=8C=96=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=85=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index be81a02..d8136c5 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -4,9 +4,7 @@ * Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ - * Version: 3.0.0 - * Text Domain: wp-china-yes - * Domain Path: /languages + * Version: 3.1.0-Beta1 * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From ef7e75513f8d225eea6c28385147e926394a59a5 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 26 Aug 2020 17:26:59 +0800 Subject: [PATCH 002/120] =?UTF-8?q?=E7=89=B9=E6=80=A7:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E5=8A=A0=E9=80=9F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E2=80=94=E2=80=94=E5=B0=86WordPress=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6=E7=9A=84=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=9B=BF=E6=8D=A2=E4=B8=BAjsDelivr=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=9A=84GitHub=E5=8A=A0=E9=80=9FCDN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.php | 28 ++++++++++++++++++++++++++++ wp-china-yes.php | 17 ++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/setting.php b/setting.php index 57c5960..688cace 100644 --- a/setting.php +++ b/setting.php @@ -6,6 +6,11 @@ function wpcy_settings_init() { */ register_setting('wpcy', 'wpapi'); + /** + * super_admin用以标记用户是否启用管理后台加速功能 + */ + register_setting('wpcy', 'super_admin'); + /** * super_gravatar用以标记用户是否启用G家头像加速功能 */ @@ -31,6 +36,14 @@ function wpcy_settings_init() { 'wpcy_section_main' ); + add_settings_field( + 'wpcy_field_select_super_admin', + '管理后台加速', + 'wpcy_field_super_admin_cb', + 'wpcy', + 'wpcy_section_main' + ); + add_settings_field( 'wpcy_field_select_super_gravatar', '加速G家头像', @@ -68,6 +81,21 @@ function wpcy_field_wpapi_cb() { + + +

+ 将WordPress核心所依赖的静态资源切换到jsDelivr上加载，此选项极大的加快管理后台访问速度 +

+ diff --git a/wp-china-yes.php b/wp-china-yes.php index d8136c5..3104b27 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -33,8 +33,9 @@ if (is_admin()) { /** * 初始化设置项 */ - if (empty(get_option('wpapi')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { + if (empty(get_option('wpapi')) || empty(get_option('super_admin')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { update_option("wpapi", '2'); + update_option("super_admin", '1'); update_option("super_gravatar", '1'); update_option("super_googlefonts", '2'); } @@ -45,6 +46,7 @@ if (is_admin()) { */ register_deactivation_hook(__FILE__, function () { delete_option("wpapi"); + delete_option("super_admin"); delete_option("super_gravatar"); delete_option("super_googlefonts"); }); @@ -82,6 +84,19 @@ if (is_admin()) { return wp_remote_request($url, $r); }, 10, 3); + + + /** + * 将WordPress核心所依赖的静态文件访问链接替换为jsDelivr提供的CDN节点 + */ + if (get_option('super_admin') == 1) { + add_action('init', function () { + ob_start(function ($buffer) { + $buffer = str_replace(esc_url(home_url('/wp-includes/css/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-includes/css/', $GLOBALS['wp_version']), $buffer); + return str_replace(esc_url(home_url('/wp-includes/js/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-includes/js/', $GLOBALS['wp_version']), $buffer); + }); + }); + } } From 788d5fba6dd3ec276496b8b81dc9d346067eb0db Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 26 Aug 2020 17:46:28 +0800 Subject: [PATCH 003/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E8=80=83=E8=99=91AJAX=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=B8=8D=E5=BF=85=E8=A6=81=E4=BB=A3=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 90 +++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index 3104b27..22ac640 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -9,7 +9,7 @@ * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ -if (is_admin()) { +if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { /** * 引入设置页 */ @@ -66,26 +66,6 @@ if (is_admin()) { }); - /** - * 替换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')) { - return false; - } - if (get_option('wpapi') == 1) { - $url = str_replace('api.wordpress.org', 'api.wp-china-yes.net', $url); - $url = str_replace('downloads.wordpress.org', 'download.wp-china-yes.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); - } - - return wp_remote_request($url, $r); - }, 10, 3); - - /** * 将WordPress核心所依赖的静态文件访问链接替换为jsDelivr提供的CDN节点 */ @@ -100,30 +80,54 @@ if (is_admin()) { } -/** - * 替换G家头像为WP-China.org维护的大陆加速节点 - */ -if (get_option('super_gravatar') == 1) { - add_filter('get_avatar', function ($avatar) { - return str_replace([ - 'www.gravatar.com', - '0.gravatar.com', - '1.gravatar.com', - '2.gravatar.com', - 'secure.gravatar.com', - 'cn.gravatar.com' - ], 'gravatar.wp-china-yes.net', $avatar); - }); +if (is_admin()) { + /** + * 替换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')) { + return false; + } + if (get_option('wpapi') == 1) { + $url = str_replace('api.wordpress.org', 'api.wp-china-yes.net', $url); + $url = str_replace('downloads.wordpress.org', 'download.wp-china-yes.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); + } + + return wp_remote_request($url, $r); + }, 10, 3); } -/** - * 替换谷歌字体为WP-China.org维护的大陆加速节点 - */ -if (get_option('super_googlefonts') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return str_replace('fonts.googleapis.com', 'googlefonts.wp-china-yes.net', $buffer); +if (!(defined('DOING_AJAX') && DOING_AJAX)) { + /** + * 替换G家头像为WP-China.org维护的大陆加速节点 + */ + if (get_option('super_gravatar') == 1) { + add_filter('get_avatar', function ($avatar) { + return str_replace([ + 'www.gravatar.com', + '0.gravatar.com', + '1.gravatar.com', + '2.gravatar.com', + 'secure.gravatar.com', + 'cn.gravatar.com' + ], 'gravatar.wp-china-yes.net', $avatar); }); - }); + } + + + /** + * 替换谷歌字体为WP-China.org维护的大陆加速节点 + */ + if (get_option('super_googlefonts') == 1) { + add_action('init', function () { + ob_start(function ($buffer) { + return str_replace('fonts.googleapis.com', 'googlefonts.wp-china-yes.net', $buffer); + }); + }); + } } From ef9a96618d59e7f547b4696d7e12bb44e6fe38a1 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 26 Aug 2020 18:11:45 +0800 Subject: [PATCH 004/120] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E6=8E=A5=E7=AE=A1=E5=BA=94=E7=94=A8=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.php | 3 +++ wp-china-yes.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/setting.php b/setting.php index 688cace..c3cedd5 100644 --- a/setting.php +++ b/setting.php @@ -72,6 +72,9 @@ function wpcy_field_wpapi_cb() { +

官方应用市场加速镜像：直接从官方反代并在大陆分发，除了增加对WP-China-Yes插件的更新支持外未做任何更改

diff --git a/wp-china-yes.php b/wp-china-yes.php index 22ac640..8153eef 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -86,7 +86,7 @@ if (is_admin()) { * 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')) { + if ((!stristr($url, 'api.wordpress.org') && !stristr($url, 'downloads.wordpress.org')) || get_option('wpapi') == 3) { return false; } if (get_option('wpapi') == 1) { From 7bdd9ce3b9a4434248abe8445937c2d56c098935 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 26 Aug 2020 18:12:06 +0800 Subject: [PATCH 005/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AWordPress?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E4=BE=9D=E8=B5=96=E7=9A=84=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE=E9=93=BE=E6=8E=A5=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=8D=E5=AE=8C=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wp-china-yes.php b/wp-china-yes.php index 8153eef..769ad74 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -72,6 +72,8 @@ if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { if (get_option('super_admin') == 1) { add_action('init', function () { ob_start(function ($buffer) { + $buffer = str_replace(esc_url(home_url('/wp-admin/css/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-admin/css/', $GLOBALS['wp_version']), $buffer); + $buffer = str_replace(esc_url(home_url('/wp-admin/js/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-admin/js/', $GLOBALS['wp_version']), $buffer); $buffer = str_replace(esc_url(home_url('/wp-includes/css/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-includes/css/', $GLOBALS['wp_version']), $buffer); return str_replace(esc_url(home_url('/wp-includes/js/')), sprintf('https://cdn.jsdelivr.net/gh/WordPress/WordPress@%s/wp-includes/js/', $GLOBALS['wp_version']), $buffer); }); From 574ba5c0b320871a19f42188be54840260cabad9 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Thu, 27 Aug 2020 11:38:35 +0800 Subject: [PATCH 006/120] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=B0=86?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=88=87=E6=8D=A2=E4=B8=BA=E8=87=AA=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=90=8C=E6=97=B6=E5=B0=86URL?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=AD=A3?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.php | 2 +- wp-china-yes.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setting.php b/setting.php index c3cedd5..cc0a812 100644 --- a/setting.php +++ b/setting.php @@ -94,7 +94,7 @@ function wpcy_field_super_admin_cb() { >禁用

- 将WordPress核心所依赖的静态资源切换到jsDelivr上加载，此选项极大的加快管理后台访问速度 + 将WordPress核心所依赖的静态文件切换为公共资源，此选项极大的加快管理后台访问速度

Date: Thu, 27 Aug 2020 19:13:35 +0800 Subject: [PATCH 007/120] =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=A2=9E=E5=8A=A0=E5=88=B03.1.1?= 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 60583f6..1140c99 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -4,7 +4,7 @@ * Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ - * Version: 3.1.0-Beta1 + * Version: 3.1.1 * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From 92a73500d487f742f7105e625778884e7393569c Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Sun, 30 Aug 2020 09:59:03 +0800 Subject: [PATCH 008/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=E5=90=8E=E8=AE=BE=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index 1140c99..2b996dc 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -34,10 +34,10 @@ if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { * 初始化设置项 */ if (empty(get_option('wpapi')) || empty(get_option('super_admin')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { - update_option("wpapi", '2'); - update_option("super_admin", '1'); - update_option("super_gravatar", '1'); - update_option("super_googlefonts", '2'); + update_option("wpapi", get_option('wpapi') ?: '2'); + update_option("super_admin", get_option('super_admin') ?: '1'); + update_option("super_gravatar", get_option('super_gravatar') ?: '1'); + update_option("super_googlefonts", get_option('super_googlefonts') ?: '2'); } From 128be6afa3ae0edd66afd76236a554caa1dcb7d5 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Sun, 30 Aug 2020 09:59:38 +0800 Subject: [PATCH 009/120] =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B03.1.2?= 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 2b996dc..bcf49d2 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -4,7 +4,7 @@ * Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ - * Version: 3.1.1 + * Version: 3.1.2 * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From 1fe82c0831b679fc4a7fcac73c651cd026e3dda5 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Sun, 30 Aug 2020 11:35:18 +0800 Subject: [PATCH 010/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=85=BC?= =?UTF-8?q?=E5=AE=B9WordPress=E5=A4=9A=E7=AB=99=E7=82=B9=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=88=E5=8F=AA=E5=9C=A8=E4=B8=BB=E6=8E=A7=E4=B8=8A=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E7=BD=AE=E9=A1=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index bcf49d2..1fecda2 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -19,15 +19,12 @@ if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { /** * 插件列表项目中增加设置项 */ - add_filter('plugin_action_links', function ($links, $file) { - if ($file != plugin_basename(__FILE__)) { - return $links; - } - $settings_link = '设置'; - array_unshift($links, $settings_link); - - return $links; - }, 10, 2); + add_filter(sprintf('%splugin_action_links_%s', is_multisite() ? 'network_admin_' : '', plugin_basename(__FILE__)), function ($links) { + return array_merge( + [sprintf('%s', network_admin_url(is_multisite() ? 'settings.php?page=wp-china-yes' : 'options-general.php?page=wp-china-yes'), '设置')], + $links + ); + }); /** @@ -55,12 +52,13 @@ if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { /** * 菜单注册 */ - add_action('admin_menu', function () { - add_options_page( + 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', - 'manage_options', - 'wp_china_yes', + is_multisite() ? 'manage_network_options' : 'manage_options', + 'wp-china-yes', 'wpcy_options_page_html' ); }); From b2470d503b238c5b712e4bdf4d1a935f17b6bdac Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Sun, 30 Aug 2020 11:36:20 +0800 Subject: [PATCH 011/120] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=E5=B9=B6=E6=9B=B4=E6=AD=A3?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E6=B3=A8=E9=87=8A=E9=94=99=E8=AF=AF?= 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 1fecda2..5148e56 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -65,12 +65,12 @@ if (is_admin() && !(defined('DOING_AJAX') && DOING_AJAX)) { /** - * 将WordPress核心所依赖的静态文件访问链接替换为jsDelivr提供的CDN节点 + * 将WordPress核心所依赖的静态文件访问链接替换为公共资源节点 */ if (get_option('super_admin') == 1) { add_action('init', function () { ob_start(function ($buffer) { - return preg_replace('~'.home_url('/').'(wp-admin|wp-includes)/(css|js)/~', sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version']), $buffer); + return preg_replace('~' . home_url('/') . '(wp-admin|wp-includes)/(css|js)/~', sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version']), $buffer); }); }); } From e3b73623247af2454663f58692c4fbb4019e0f6c Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Sun, 30 Aug 2020 11:41:24 +0800 Subject: [PATCH 012/120] =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9A=E7=9D=80?= =?UTF-8?q?=E9=87=8D=E8=AF=B4=E6=98=8E=E6=9C=AC=E5=9C=9F=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=BD=93=E5=89=8D=E5=B1=9E=E4=BA=8E=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setting.php b/setting.php index cc0a812..13bf354 100644 --- a/setting.php +++ b/setting.php @@ -79,7 +79,7 @@ function wpcy_field_wpapi_cb() { 官方应用市场加速镜像：直接从官方反代并在大陆分发，除了增加对WP-China-Yes插件的更新支持外未做任何更改

- 本土应用市场：与本土翻译平台深度整合，为大家提供基于AI翻译+人工辅助校准的全量作品汉化支持（注意，这仍属于试验阶段，存在可能的接口报错、速度缓慢等问题，问题反馈） + 本土应用市场：与本土翻译平台深度整合，为大家提供基于AI翻译+人工辅助校准的全量作品汉化支持（注意，这仍属于试验阶段，存在可能的接口报错、速度缓慢等问题，问题反馈）

Date: Fri, 18 Sep 2020 11:35:12 +0800 Subject: [PATCH 013/120] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=B0=86?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=E5=8C=85=E5=90=AB=E5=88=B0?= =?UTF-8?q?WP=5FCHINA=5FYES=E7=B1=BB=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.php | 154 -------------------- wp-china-yes.php | 363 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 260 insertions(+), 257 deletions(-) delete mode 100644 setting.php diff --git a/setting.php b/setting.php deleted file mode 100644 index 13bf354..0000000 --- a/setting.php +++ /dev/null @@ -1,154 +0,0 @@ - - - - -

- 官方应用市场加速镜像：直接从官方反代并在大陆分发，除了增加对WP-China-Yes插件的更新支持外未做任何更改 -

-

- 本土应用市场：与本土翻译平台深度整合，为大家提供基于AI翻译+人工辅助校准的全量作品汉化支持（注意，这仍属于试验阶段，存在可能的接口报错、速度缓慢等问题，问题反馈） -

- - - -

- 将WordPress核心所依赖的静态文件切换为公共资源，此选项极大的加快管理后台访问速度 -

- - - -

- 为Gravatar头像加速，推荐所有用户启用该选项 -

- - - -

- 请只在主题包含谷歌字体的情况下才启用该选项，以免造成不必要的性能损失 -

- -
-

-
- -
-
-

- WP中国本土化社区的使命是帮助WordPress在中国建立起良好的本土生态环境，以求推进行业整体发展，做大市场蛋糕。
- 特别感谢知更鸟、薇晓朵团队、AppNode在项目萌芽期给予的帮助。 -

- init(); +class WP_CHINA_YES { + private $page_url; - /** - * 插件列表项目中增加设置项 - */ - add_filter(sprintf('%splugin_action_links_%s', is_multisite() ? 'network_admin_' : '', plugin_basename(__FILE__)), function ($links) { - return array_merge( - [sprintf('%s', network_admin_url(is_multisite() ? 'settings.php?page=wp-china-yes' : 'options-general.php?page=wp-china-yes'), '设置')], - $links - ); - }); - - - /** - * 初始化设置项 - */ - if (empty(get_option('wpapi')) || empty(get_option('super_admin')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { - update_option("wpapi", get_option('wpapi') ?: '2'); - update_option("super_admin", get_option('super_admin') ?: '1'); - update_option("super_gravatar", get_option('super_gravatar') ?: '1'); - update_option("super_googlefonts", get_option('super_googlefonts') ?: '2'); + public function __construct() { + $this->page_url = network_admin_url(is_multisite() ? 'settings.php?page=wp-china-yes' : 'options-general.php?page=wp-china-yes'); } - - /** - * 禁用插件时删除配置 - */ - register_deactivation_hook(__FILE__, function () { - delete_option("wpapi"); - delete_option("super_admin"); - delete_option("super_gravatar"); - delete_option("super_googlefonts"); - }); - - - /** - * 菜单注册 - */ - 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', - 'wpcy_options_page_html' - ); - }); - - - /** - * 将WordPress核心所依赖的静态文件访问链接替换为公共资源节点 - */ - if (get_option('super_admin') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return preg_replace('~' . home_url('/') . '(wp-admin|wp-includes)/(css|js)/~', sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version']), $buffer); + 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 + ); }); - }); - } -} -if (is_admin()) { - /** - * 替换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 false; - } - if (get_option('wpapi') == 1) { - $url = str_replace('api.wordpress.org', 'api.wp-china-yes.net', $url); - $url = str_replace('downloads.wordpress.org', 'download.wp-china-yes.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); + /** + * 初始化设置项 + */ + if (empty(get_option('wpapi')) || empty(get_option('super_admin')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { + update_option("wpapi", get_option('wpapi') ?: '2'); + update_option("super_admin", get_option('super_admin') ?: '1'); + update_option("super_gravatar", get_option('super_gravatar') ?: '1'); + update_option("super_googlefonts", get_option('super_googlefonts') ?: '2'); + } + + + /** + * 禁用插件时删除配置 + */ + register_deactivation_hook(__FILE__, function () { + delete_option("wpapi"); + delete_option("super_admin"); + delete_option("super_gravatar"); + delete_option("super_googlefonts"); + }); + + + /** + * 菜单注册 + */ + 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') == 1) { + add_action('init', function () { + ob_start(function ($buffer) { + return preg_replace('~' . home_url('/') . '(wp-admin|wp-includes)/(css|js)/~', sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version']), $buffer); + }); + }); + } } - return wp_remote_request($url, $r); - }, 10, 3); -} + if (is_admin()) { + add_action('admin_init', function () { + /** + * wpapi用以标记用户所选的仓库api，数值说明：1 使用由WP-China.org提供的国区定制API，2 只是经代理加速的api.wordpress.org原版API + */ + register_setting('wpcy', 'wpapi'); -if (!(defined('DOING_AJAX') && DOING_AJAX)) { - /** - * 替换G家头像为WP-China.org维护的大陆加速节点 - */ - if (get_option('super_gravatar') == 1) { - add_filter('get_avatar', function ($avatar) { - return str_replace([ - 'www.gravatar.com', - '0.gravatar.com', - '1.gravatar.com', - '2.gravatar.com', - 'secure.gravatar.com', - 'cn.gravatar.com' - ], 'gravatar.wp-china-yes.net', $avatar); - }); - } + /** + * super_admin用以标记用户是否启用管理后台加速功能 + */ + register_setting('wpcy', 'super_admin'); + /** + * super_gravatar用以标记用户是否启用G家头像加速功能 + */ + register_setting('wpcy', 'super_gravatar'); - /** - * 替换谷歌字体为WP-China.org维护的大陆加速节点 - */ - if (get_option('super_googlefonts') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return str_replace('fonts.googleapis.com', 'googlefonts.wp-china-yes.net', $buffer); + /** + * 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', + '加速G家头像', + [$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' + ); }); - }); + + /** + * 替换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 false; + } + if (get_option('wpapi') == 1) { + $url = str_replace('api.wordpress.org', 'api.wp-china-yes.net', $url); + $url = str_replace('downloads.wordpress.org', 'download.wp-china-yes.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); + } + + return wp_remote_request($url, $r); + }, 10, 3); + } + + + if ( ! (defined('DOING_AJAX') && DOING_AJAX)) { + /** + * 替换G家头像为WP-China.org维护的大陆加速节点 + */ + if (get_option('super_gravatar') == 1) { + add_filter('get_avatar', function ($avatar) { + return str_replace([ + 'www.gravatar.com', + '0.gravatar.com', + '1.gravatar.com', + '2.gravatar.com', + 'secure.gravatar.com', + 'cn.gravatar.com' + ], 'gravatar.wp-china-yes.net', $avatar); + }); + } + + + /** + * 替换谷歌字体为WP-China.org维护的大陆加速节点 + */ + if (get_option('super_googlefonts') == 1) { + add_action('init', function () { + ob_start(function ($buffer) { + return str_replace('fonts.googleapis.com', 'googlefonts.wp-china-yes.net', $buffer); + }); + }); + } + } + } + + public function field_wpapi_cb() { + $wpapi = get_option('wpapi'); + ?> + + + +

+ 官方应用市场加速镜像：直接从官方反代并在大陆分发，除了增加对WP-China-Yes插件的更新支持外未做任何更改 +

+

+ 本土应用市场：与本土翻译平台深度整合，为大家提供基于AI翻译+人工辅助校准的全量作品汉化支持（注意，这仍属于试验阶段，存在可能的接口报错、速度缓慢等问题，问题反馈） +

+ + + +

+ 将WordPress核心所依赖的静态文件切换为公共资源，此选项极大的加快管理后台访问速度 +

+ + + +

+ 为Gravatar头像加速，推荐所有用户启用该选项 +

+ + + +

+ 请只在主题包含谷歌字体的情况下才启用该选项，以免造成不必要的性能损失 +

+ +
+

+
+ +
+
+

+ WP中国本土化社区的使命是帮助WordPress在中国建立起良好的本土生态环境，以求推进行业整体发展，做大市场蛋糕。
+ 特别感谢知更鸟、薇晓朵团队、AppNode在项目萌芽期给予的帮助。 +

+ Date: Fri, 18 Sep 2020 11:48:59 +0800 Subject: [PATCH 014/120] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B03.1.3?= 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 248701e..de7beef 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -4,7 +4,7 @@ * Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ - * Version: 3.1.2 + * Version: 3.1.3 * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From 7203f02e087db74282b516e5256bc014c4dc9b02 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Fri, 18 Sep 2020 11:49:11 +0800 Subject: [PATCH 015/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=A4=9A?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=85=8D=E7=BD=AE=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index de7beef..0381b8b 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -262,6 +262,15 @@ class WP_CHINA_YES { } 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'])); + + echo '

设置已保存

'; + } + if (!current_user_can('manage_options')) { return; } @@ -270,7 +279,7 @@ class WP_CHINA_YES { ?>

-
+ Date: Fri, 18 Sep 2020 12:08:06 +0800 Subject: [PATCH 016/120] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9C=A8?= =?UTF-8?q?=E5=A4=9A=E7=AB=99=E7=82=B9=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=9C=A8=E5=AD=90=E7=AB=99=E7=82=B9=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/wp-china-yes.php b/wp-china-yes.php index 0381b8b..ceaec97 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -5,6 +5,7 @@ * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ * Version: 3.1.3 + * Network: True * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From baa486cff93f4bf4c17de80ace616004f13f5d44 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 7 Oct 2020 10:37:33 +0800 Subject: [PATCH 017/120] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E6=9D=A1=E4=BB=B6=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index ceaec97..d884cea 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -35,12 +35,10 @@ class WP_CHINA_YES { /** * 初始化设置项 */ - if (empty(get_option('wpapi')) || empty(get_option('super_admin')) || empty(get_option('super_gravatar')) || empty(get_option('super_googlefonts'))) { - update_option("wpapi", get_option('wpapi') ?: '2'); - update_option("super_admin", get_option('super_admin') ?: '1'); - update_option("super_gravatar", get_option('super_gravatar') ?: '1'); - update_option("super_googlefonts", get_option('super_googlefonts') ?: '2'); - } + update_option("wpapi", get_option('wpapi') ?: '2'); + update_option("super_admin", get_option('super_admin') ?: '1'); + update_option("super_gravatar", get_option('super_gravatar') ?: '1'); + update_option("super_googlefonts", get_option('super_googlefonts') ?: '2'); /** From 2958937f09bfc60e41ef00e8e432a81e8222d68e Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 7 Oct 2020 10:42:15 +0800 Subject: [PATCH 018/120] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B0=B7=E6=AD=8C=E5=89=8D=E7=AB=AF=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=BA=93=E5=8A=A0=E9=80=9F=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/wp-china-yes.php b/wp-china-yes.php index d884cea..500fc2e 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -39,6 +39,7 @@ class WP_CHINA_YES { update_option("super_admin", get_option('super_admin') ?: '1'); 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'); /** @@ -140,6 +141,14 @@ class WP_CHINA_YES { 'wpcy', 'wpcy_section_main' ); + + add_settings_field( + 'wpcy_field_select_super_googleajax', + '加速谷歌前端公共库', + [$this, 'field_super_googleajax_cb'], + 'wpcy', + 'wpcy_section_main' + ); }); /** @@ -191,6 +200,17 @@ class WP_CHINA_YES { }); }); } + + /** + * 替换谷歌前端公共库为WP-China.org维护的大陆加速节点 + */ + if (get_option('super_googleajax') == 1) { + add_action('init', function () { + ob_start(function ($buffer) { + return str_replace('ajax.googleapis.com', 'googleajax.wp-china-yes.net', $buffer); + }); + }); + } } } @@ -260,12 +280,28 @@ class WP_CHINA_YES { + + +

+ 请只在主题包含谷歌前端公共库的情况下才启用该选项，以免造成不必要的性能损失 +

+

设置已保存

'; } From 0ee8c8a937109536f48d533dd3fe142d860ae400 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 7 Oct 2020 10:42:25 +0800 Subject: [PATCH 019/120] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B03.2.0?= 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 500fc2e..78224d1 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -4,7 +4,7 @@ * Description: 将你的WordPress接入本土生态体系中，这将为你提供一个更贴近中国人使用习惯的WordPress * Author: WP中国本土化社区 * Author URI:https://wp-china.org/ - * Version: 3.1.3 + * Version: 3.2.0 * Network: True * License: GPLv3 or later * License URI: http://www.gnu.org/licenses/gpl-3.0.html From c52ed2afaac99e8c12b3315258345d5c639725b0 Mon Sep 17 00:00:00 2001 From: sunxiyuan Date: Wed, 7 Oct 2020 12:06:06 +0800 Subject: [PATCH 020/120] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E4=B8=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index 78224d1..5c63905 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -72,11 +72,10 @@ class WP_CHINA_YES { * 将WordPress核心所依赖的静态文件访问链接替换为公共资源节点 */ if (get_option('super_admin') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return preg_replace('~' . home_url('/') . '(wp-admin|wp-includes)/(css|js)/~', sprintf('https://a2.wp-china-yes.net/WordPress@%s/$1/$2/', $GLOBALS['wp_version']), $buffer); - }); - }); + $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']) + ]); } } @@ -194,22 +193,14 @@ class WP_CHINA_YES { * 替换谷歌字体为WP-China.org维护的大陆加速节点 */ if (get_option('super_googlefonts') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return str_replace('fonts.googleapis.com', 'googlefonts.wp-china-yes.net', $buffer); - }); - }); + $this->page_str_replace('str_replace', ['fonts.googleapis.com', 'googlefonts.wp-china-yes.net']); } /** * 替换谷歌前端公共库为WP-China.org维护的大陆加速节点 */ if (get_option('super_googleajax') == 1) { - add_action('init', function () { - ob_start(function ($buffer) { - return str_replace('ajax.googleapis.com', 'googleajax.wp-china-yes.net', $buffer); - }); - }); + $this->page_str_replace('str_replace', ['ajax.googleapis.com', 'googleajax.wp-china-yes.net']); } } } @@ -328,4 +319,13 @@ class WP_CHINA_YES {

Date: Wed, 7 Oct 2020 12:21:11 +0800 Subject: [PATCH 021/120] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E7=BB=86?= =?UTF-8?q?=E5=8C=96=E5=90=8E=E5=8F=B0=E6=8E=A7=E5=88=B6=E7=9A=84=E9=A2=97?= =?UTF-8?q?=E7=B2=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wp-china-yes.php | 63 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/wp-china-yes.php b/wp-china-yes.php index 5c63905..03e8acc 100644 --- a/wp-china-yes.php +++ b/wp-china-yes.php @@ -71,11 +71,11 @@ class WP_CHINA_YES { /** * 将WordPress核心所依赖的静态文件访问链接替换为公共资源节点 */ - if (get_option('super_admin') == 1) { + if (get_option('super_admin') != 2) { $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')); } } @@ -192,15 +192,15 @@ class WP_CHINA_YES { /** * 替换谷歌字体为WP-China.org维护的大陆加速节点 */ - if (get_option('super_googlefonts') == 1) { - $this->page_str_replace('str_replace', ['fonts.googleapis.com', 'googlefonts.wp-china-yes.net']); + if (get_option('super_googlefonts') != 2) { + $this->page_str_replace('str_replace', ['fonts.googleapis.com', 'googlefonts.wp-china-yes.net'], get_option('super_googlefonts')); } /** * 替换谷歌前端公共库为WP-China.org维护的大陆加速节点 */ - if (get_option('super_googleajax') == 1) { - $this->page_str_replace('str_replace', ['ajax.googleapis.com', 'googleajax.wp-china-yes.net']); + if (get_option('super_googleajax') != 2) { + $this->page_str_replace('str_replace', ['ajax.googleapis.com', 'googleajax.wp-china-yes.net'], get_option('super_googleajax')); } } } @@ -245,7 +245,13 @@ class WP_CHINA_YES { $super_gravatar = get_option('super_gravatar'); ?> + +