From 6fd8b5f03c3c2f31979f723db712c5cf3b10a8a6 Mon Sep 17 00:00:00 2001
From: jerryzwu <jerryzwu@tencent.com>
Date: Mon, 14 Dec 2020 13:09:38 +0800
Subject: [PATCH] support windows

---
 README.md                                     |  8 +++--
 .../TencentWordPressIMSActions.php            | 29 +++------------
 .../TencentWordpressIMSSettingPage.php        |  3 +-
 .../TencentWordpressPluginsSettingActions.php | 35 ++++++++-----------
 tencentcloud-ims/common/common.json           |  2 +-
 tencentcloud-ims/readme.txt                   | 11 ++++--
 tencentcloud-ims/tencentcloud-ims.php         | 12 +++----
 7 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index bffa620..f6af945 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 | ---------- | ------------------------------------------------------------ |
 | 中文名称      | 腾讯云图片内容安全（IMS）插件                                         |
 | 英文名称   | tencentcloud-ims                                       |
-| 最新版本   | v1.0.0 (2020.06.22)                                           |
+| 最新版本   | v1.0.1 (2020.12.11)                                           |
 | 适用平台 | [WordPress](https://wordpress.org/)                             |
 | 适用产品 | [腾讯云图片内容安全（IMS）](https://cloud.tencent.com/product/ims) |
 | 文档中心   | [春雨文档中心](https://openapp.qq.com/docs/Wordpress/ims.html) |
@@ -65,9 +65,11 @@
 
 ## 7.GitHub版本迭代记录
 
-### 7.1 tencentcloud-wordpress-plugin-ims v1.0.0
-- 对用户在媒体库上传、通过URL插入的图片使用腾讯云图片内容安全接口进行内容检测和过滤
+### 2020.12.11 tencentcloud-wordpress-plugin-ims v1.0.1
+- 支持在windows环境下运行
 
+### 2020.6.22 tencentcloud-wordpress-plugin-ims v1.0.0
+- 对用户在媒体库上传、通过URL插入的图片使用腾讯云图片内容安全接口进行内容检测和过滤
 ---
 本项目由腾讯云中小企业产品中心建设和维护，了解与该插件使用相关的更多信息，请访问[春雨文档中心](https://openapp.qq.com/docs/Wordpress/ims.html) 
 
diff --git a/tencentcloud-ims/TencentWordPressIMSActions.php b/tencentcloud-ims/TencentWordPressIMSActions.php
index d706293..5e779fe 100644
--- a/tencentcloud-ims/TencentWordPressIMSActions.php
+++ b/tencentcloud-ims/TencentWordPressIMSActions.php
@@ -113,30 +113,9 @@ class TencentWordPressIMSActions
         $staticData['data']['site_id'] = TencentWordpressPluginsSettingActions::getWordPressSiteID();
         $staticData['data']['site_url'] = TencentWordpressPluginsSettingActions::getWordPressSiteUrl();
         $staticData['data']['site_app'] = TencentWordpressPluginsSettingActions::getWordPressSiteApp();
-        $commonOption = get_option(TENCENT_WORDPRESS_COMMON_OPTIONS);
-        if (!empty($commonOption)) {
-            $staticData['data']['site_report_on'] = intval($commonOption['site_report_on']);
-            $staticData['data']['site_sec_on'] = intval($commonOption['site_sec_on']);
-            if ($commonOption['site_report_on'] === true && isset($commonOption['secret_id']) && isset($commonOption['secret_key'])) {
-                $staticData['data']['site_global_uin'] = TencentWordpressPluginsSettingActions::getUserUinBySecret($commonOption['secret_id'], $commonOption['secret_key']);
-            }
-        }
-
         $IMSOptions = self::getIMSOptionsObject();
-        if ($IMSOptions->getCustomKey() === $IMSOptions::CUSTOM_KEY) {
-            $staticData['data']['ims_uin'] = TencentWordpressPluginsSettingActions::getUserUinBySecret($IMSOptions->getSecretID(), $IMSOptions->getSecretKey());
-        }
-        $staticData['data']['ims_sec_on'] = $IMSOptions->getCustomKey();
-        switch ($action){
-            case 'activate':
-            case 'save_configuration':
-            $staticData['data']['ims_on_at'] = time();
-                break;
-            case 'deactivate':
-            case 'uninstall':
-            $staticData['data']['ims_off_at'] = time();
-                break;
-        }
+        $staticData['data']['uin'] = TencentWordpressPluginsSettingActions::getUserUinBySecret($IMSOptions->getSecretID(), $IMSOptions->getSecretKey());
+        $staticData['data']['cust_sec_on'] = $IMSOptions->getCustomKey() === $IMSOptions::CUSTOM_KEY ?1:2;
         return $staticData;
     }
 
@@ -285,7 +264,7 @@ class TencentWordPressIMSActions
     {
         //只在后台配置页引入
         if (strpos($hookSuffix,'page_TencentWordpressIMSSettingPage') !== false){
-            wp_register_style('IMS_back_admin_css', TENCENT_WORDPRESS_TMS_CSS_DIR . 'bootstrap.min.css');
+            wp_register_style('IMS_back_admin_css', TENCENT_WORDPRESS_IMS_CSS_DIR . 'bootstrap.min.css');
             wp_enqueue_style('IMS_back_admin_css');
         }
     }
@@ -317,7 +296,7 @@ class TencentWordPressIMSActions
             $IMSOptions->setSecretKey($this->filterPostParam('secretKey'));
             $IMSOptions->setCheckUrlImg($this->filterPostParam('checkUrlImg',$IMSOptions::DO_NOT_CHECK));
             self::requirePluginCenterClass();
-            $staticData = self::getTencentCloudWordPressStaticData('save_configuration');
+            $staticData = self::getTencentCloudWordPressStaticData('save_config');
             TencentWordpressPluginsSettingActions::sendUserExperienceInfo($staticData);
             update_option(TENCENT_WORDPRESS_IMS_OPTIONS,$IMSOptions,true);
             wp_send_json_success(array('msg'=>'保存成功'));
diff --git a/tencentcloud-ims/TencentWordpressIMSSettingPage.php b/tencentcloud-ims/TencentWordpressIMSSettingPage.php
index 014b316..5c41e4f 100644
--- a/tencentcloud-ims/TencentWordpressIMSSettingPage.php
+++ b/tencentcloud-ims/TencentWordpressIMSSettingPage.php
@@ -26,7 +26,6 @@ function TencentWordpressIMSSettingPage()
     $customKey = $IMSOptions->getCustomKey();
 
     ?>
-    <link rel="stylesheet" href="<?php echo TENCENT_WORDPRESS_IMS_CSS_DIR . 'bootstrap.min.css' ?>">
     <style type="text/css">
         .dashicons {
             vertical-align: middle;
@@ -119,7 +118,7 @@ function TencentWordpressIMSSettingPage()
         <button id="ims-options-update-button" type="button" class="btn btn-primary">保存配置</button>
         <div style="text-align: center;flex: 0 0 auto;margin-top: 3rem;">
             <a href="https://openapp.qq.com/docs/Wordpress/ims.html" target="_blank">文档中心</a> | <a href="https://github.com/Tencent-Cloud-Plugins/tencentcloud-wordpress-plugin-ims" target="_blank">GitHub</a> | <a
-                    href="https://support.qq.com/product/164613" target="_blank">意见反馈</a>
+                    href="https://da.do/y0rp" target="_blank">意见反馈</a>
         </div>
     </div>
 <?php
diff --git a/tencentcloud-ims/common/TencentWordpressPluginsSettingActions.php b/tencentcloud-ims/common/TencentWordpressPluginsSettingActions.php
index b63061b..cb9c0fb 100644
--- a/tencentcloud-ims/common/TencentWordpressPluginsSettingActions.php
+++ b/tencentcloud-ims/common/TencentWordpressPluginsSettingActions.php
@@ -32,8 +32,9 @@ if (!class_exists('TencentWordpressPluginsSettingActions')) {
         private static $initiated = false;
         private static $wpdb;
 
-        private static $log_server_url = 'localhost:8001';
+        private static $log_server_url = 'https://appdata.qq.com/upload';
         private static $site_app = 'WordPress';
+        private static $config_action = array('save_common_config', 'save_config');
         //表名
         const TABLE_NAME = 'wp_tencent_wordpress_options';
         //插件开启
@@ -126,20 +127,10 @@ if (!class_exists('TencentWordpressPluginsSettingActions')) {
                 )
             );
             $common_option = get_option(TENCENT_WORDPRESS_COMMON_OPTIONS);
-            if (!empty($common_option)) {
-                $site_report_on = (int)$common_option['site_report_on'];
-                $site_sec_on = (int)$common_option['site_sec_on'];
-                $static_data['data']['site_report_on'] = $site_report_on;
-                $static_data['data']['site_sec_on'] = $site_sec_on;
-                if ($common_option['site_report_on'] === true && isset($common_option['secret_id']) && isset($common_option['secret_key'])) {
-                    $static_data['data']['site_global_uin'] = self::getUserUinBySecret($common_option['secret_id'], $common_option['secret_key']);
-                }
-                if ($common_option['site_sec_on'] === true) {
-                    $static_data['data']['secret_on_at'] = time();
-                } else {
-                    $static_data['data']['secret_off_at'] = time();
-                }
+            if (isset($common_option['secret_id']) && isset($common_option['secret_key'])) {
+                $static_data['data']['uin'] = self::getUserUinBySecret($common_option['secret_id'], $common_option['secret_key']);
             }
+
             self::sendUserExperienceInfo($static_data);
         }
 
@@ -428,17 +419,21 @@ if (!class_exists('TencentWordpressPluginsSettingActions')) {
          */
         public static function sendUserExperienceInfo($data)
         {
-            if (empty($data) || !is_array($data)) {
+            if (empty($data) || !is_array($data) || !isset($data['action'])) {
                 return ;
             }
             $common_option = get_option(TENCENT_WORDPRESS_COMMON_OPTIONS);
-            // 未参与用户体验优化项目，则不发送插件的使用信息
-            if (isset($common_option['site_report_on']) && $common_option['site_report_on'] === false) {
-                return false;
-            }
             $url = self::getLogServerUrl();
 
-            self::sendPostRequest($url, $data);
+            if (in_array($data['action'], self::$config_action)) {
+                self::sendPostRequest($url, $data);
+                return true;
+            } elseif (isset($common_option['site_report_on']) && $common_option['site_report_on'] === true) {
+                self::sendPostRequest($url, $data);
+                return true;
+            } else {
+                return false;
+            }
         }
 
         /**
diff --git a/tencentcloud-ims/common/common.json b/tencentcloud-ims/common/common.json
index 4663330..9fe0c22 100644
--- a/tencentcloud-ims/common/common.json
+++ b/tencentcloud-ims/common/common.json
@@ -1,4 +1,4 @@
 {
   "version": "1.0.0",
-  "log_server_url": "https://openapp.qq.com/api/public/index.php/upload"
+  "log_server_url": "https://appdata.qq.com/upload"
 }
\ No newline at end of file
diff --git a/tencentcloud-ims/readme.txt b/tencentcloud-ims/readme.txt
index 13bda6e..1b00f5d 100644
--- a/tencentcloud-ims/readme.txt
+++ b/tencentcloud-ims/readme.txt
@@ -1,11 +1,11 @@
 === 腾讯云图片内容安全（IMS） ===
 Contributors: TencentCloud
-Tags: 腾讯云, 图片审核, 图片内容安全, Tencent, IMS
-Donate link: https://openapp.qq.com/Wordpress/ims.html
+Tags: 腾讯云, 图片审核, 图片内容安全, Tencent Cloud, qcloud, IMS, 春雨
+Donate link: https://openapp.qq.com/docs/Wordpress/ims.html
 Requires at least: 5.0
 Tested up to: 5.4.1
 Requires PHP: 5.6
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: Apache 2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0.txt
 
@@ -25,7 +25,12 @@ tencentcloud-ims插件是一款腾讯云研发的，提供给WordPress站长使
 
 == Screenshots ==
 1. screenshot-1.png
+2. screenshot-2.png
+3. screenshot-3.png
 
 == Changelog ==
 = 1.0.0 =
 * 对媒体库上传和URL插入的图片进行内容检测和过滤.
+
+= 1.0.1 =
+* 支持在windows环境下运行.
diff --git a/tencentcloud-ims/tencentcloud-ims.php b/tencentcloud-ims/tencentcloud-ims.php
index b639026..829998b 100644
--- a/tencentcloud-ims/tencentcloud-ims.php
+++ b/tencentcloud-ims/tencentcloud-ims.php
@@ -19,23 +19,23 @@ Plugin Name: tencentcloud-ims
 Plugin URI: https://openapp.qq.com/docs/Wordpress/ims.html
 Author URI: https://cloud.tencent.com/product/ims
 Description: 通过腾讯云图片内容安全服务对媒体库上传和URL插入的图片进行内容检测和过滤。
-Version: 1.0.0
+Version: 1.0.1
 Author: 腾讯云
  */
-defined('TENCENT_WORDPRESS_IMS_VERSION')||define( 'TENCENT_WORDPRESS_IMS_VERSION', '1.0.0');
+defined('TENCENT_WORDPRESS_IMS_VERSION')||define( 'TENCENT_WORDPRESS_IMS_VERSION', '1.0.1');
 defined('TENCENT_WORDPRESS_IMS_OPTIONS')||define( 'TENCENT_WORDPRESS_IMS_OPTIONS', 'tencent_wordpress_ims_options' );
 defined('TENCENT_WORDPRESS_IMS_DIR')||define( 'TENCENT_WORDPRESS_IMS_DIR', plugin_dir_path( __FILE__ ) );
 defined('TENCENT_WORDPRESS_IMS_BASENAME')||define( 'TENCENT_WORDPRESS_IMS_BASENAME', plugin_basename(__FILE__));
 defined('TENCENT_WORDPRESS_IMS_URL')||define( 'TENCENT_WORDPRESS_IMS_URL', plugins_url( 'tencentcloud-ims' ) );
-defined('TENCENT_WORDPRESS_IMS_JS_DIR')||define( 'TENCENT_WORDPRESS_IMS_JS_DIR', TENCENT_WORDPRESS_IMS_URL . DIRECTORY_SEPARATOR.'js'.DIRECTORY_SEPARATOR );
-defined('TENCENT_WORDPRESS_IMS_CSS_DIR')||define( 'TENCENT_WORDPRESS_IMS_CSS_DIR', TENCENT_WORDPRESS_IMS_URL . DIRECTORY_SEPARATOR.'css'.DIRECTORY_SEPARATOR );
+defined('TENCENT_WORDPRESS_IMS_JS_DIR')||define( 'TENCENT_WORDPRESS_IMS_JS_DIR', TENCENT_WORDPRESS_IMS_URL . '/js/' );
+defined('TENCENT_WORDPRESS_IMS_CSS_DIR')||define( 'TENCENT_WORDPRESS_IMS_CSS_DIR', TENCENT_WORDPRESS_IMS_URL . '/css/' );
 //插件中心常量
 defined('TENCENT_WORDPRESS_IMS_NAME')||define( 'TENCENT_WORDPRESS_IMS_NAME', 'tencentcloud-plugin-ims');
 defined('TENCENT_WORDPRESS_COMMON_OPTIONS')||define( 'TENCENT_WORDPRESS_COMMON_OPTIONS', 'tencent_wordpress_common_options' );
 defined('TENCENT_WORDPRESS_IMS_SHOW_NAME')||define( 'TENCENT_WORDPRESS_IMS_SHOW_NAME', 'tencentcloud-ims');
-defined('TENCENT_WORDPRESS_PLUGINS_COMMON_URL')||define('TENCENT_WORDPRESS_PLUGINS_COMMON_URL', TENCENT_WORDPRESS_IMS_URL .DIRECTORY_SEPARATOR. 'common' . DIRECTORY_SEPARATOR);
+defined('TENCENT_WORDPRESS_PLUGINS_COMMON_URL')||define('TENCENT_WORDPRESS_PLUGINS_COMMON_URL', TENCENT_WORDPRESS_IMS_URL . '/common/');
 defined('TENCENT_WORDPRESS_PLUGINS_COMMON_DIR')||define('TENCENT_WORDPRESS_PLUGINS_COMMON_DIR', TENCENT_WORDPRESS_IMS_DIR . 'common' . DIRECTORY_SEPARATOR);
-defined('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL')||define('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL', TENCENT_WORDPRESS_PLUGINS_COMMON_URL . 'css' . DIRECTORY_SEPARATOR);
+defined('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL')||define('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL', TENCENT_WORDPRESS_PLUGINS_COMMON_URL . '/css/');
 
 if (!is_file(TENCENT_WORDPRESS_IMS_DIR.'vendor/autoload.php')) {
     wp_die('缺少依赖文件，请确保安装了腾讯云sdk','缺少依赖文件',array('back_link'=>true));
-- 
Gitee