From c88b304d7cce28fe7c26f6f5b70aecdabe1b94e5 Mon Sep 17 00:00:00 2001
From: jianbo <20397795@qq.com>
Date: Tue, 15 Sep 2020 16:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E8=AE=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=AE=BE=E7=BD=AE=EF=BC=9A=E8=AF=84=E8=AE=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8F=AA=E9=92=88=E5=AF=B9=E8=AE=A2=E9=98=85=E8=80=85?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/api/ram-rest-comments-controller.php | 20 ++++++++++++-------
 includes/settings/wp-wechat-config.php        |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/includes/api/ram-rest-comments-controller.php b/includes/api/ram-rest-comments-controller.php
index f3660ea..57a3398 100644
--- a/includes/api/ram-rest-comments-controller.php
+++ b/includes/api/ram-rest-comments-controller.php
@@ -139,12 +139,8 @@ class RAM_REST_Comments_Controller  extends WP_REST_Controller{
         $authorIp =ram_get_client_ip();
 	    $authorIp= empty($authorIp)?'':$authorIp;
         $wf_enable_comment_check= get_option('wf_enable_comment_check');
-        $comment_approved="1";
-        if(!empty($wf_enable_comment_check))
-        {
-             $comment_approved="0";
-
-        }
+       
+        
         $data = array(
 			'content' =>$content
 		);
@@ -162,6 +158,15 @@ class RAM_REST_Comments_Controller  extends WP_REST_Controller{
         $useropenid="";
         $sql ="SELECT ID FROM ".$wpdb->users ." WHERE user_login='".$openid."'";
         $user_id= (int)$wpdb->get_var($sql); //评论者id
+
+        $comment_approved="1";
+        $userLevel= getUserLevel($user_id);
+
+        if(!empty($wf_enable_comment_check) && $userLevel["level"] =='0')
+        {
+             $comment_approved="0";
+
+        }
        
         $commentdata = array(
         'comment_post_ID' => $post, // to which post the comment will show up
@@ -196,13 +201,14 @@ class RAM_REST_Comments_Controller  extends WP_REST_Controller{
             $result["code"]="success";
             $message='留言成功';
 
-            if(!empty($wf_enable_comment_check))
+            if(!empty($wf_enable_comment_check) && $userLevel["level"] =='0')
             {
                 $message='留言已提交,需管理员审核方可显示。';
             }
 
             
             $result["status"]="200"; 
+            $result["level"]=$userLevel;
             $result['comment_approved']=$comment_approved;
             $result["message"]=$message;
             $result["useropenid"]=$useropenid;
diff --git a/includes/settings/wp-wechat-config.php b/includes/settings/wp-wechat-config.php
index cf9dd08..51afa23 100644
--- a/includes/settings/wp-wechat-config.php
+++ b/includes/settings/wp-wechat-config.php
@@ -173,7 +173,7 @@ if (version_compare(PHP_VERSION, '5.6.0', '<=') )
                 
 
                            ?>
-                           &emsp;&emsp;&emsp;&emsp;开启评论审核
+                           &emsp;&emsp;&emsp;&emsp;“订阅者”用户开启评论审核
 
                 <?php
                 $wf_enable_comment_check =get_option('wf_enable_comment_check');            
-- 
GitLab