From 2dfd652016f17192aa4496a2fe876834021f91b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B9=96=E4=B8=AD=E6=B2=89?= <341936031@qq.com>
Date: Wed, 24 Feb 2021 16:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B8=B8=E5=AE=A2=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E4=B8=94=E6=97=A0?=
 =?UTF-8?q?=E5=A4=84=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/admincp_setting.php     |  6 ++++++
 upload/source/include/space/space_profile.php | 12 +++++++++++-
 upload/source/language/lang_admincp.php       |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/upload/source/admincp/admincp_setting.php b/upload/source/admincp/admincp_setting.php
index 538ee36b1..93b3cf964 100644
--- a/upload/source/admincp/admincp_setting.php
+++ b/upload/source/admincp/admincp_setting.php
@@ -278,6 +278,12 @@ if(!submitcheck('settingsubmit')) {
 			array(2, $lang['setting_home_privacy_self']),
 			array(3, $lang['setting_home_privacy_register'])
 		)), $setting['privacy']['view']['index'], 'select');
+		showsetting('setting_home_privacy_view_profile', array('settingnew[privacy][view][profile]', array(
+			array(0, $lang['setting_home_privacy_alluser']),
+			array(1, $lang['setting_home_privacy_friend']),
+			array(2, $lang['setting_home_privacy_self']),
+			array(3, $lang['setting_home_privacy_register'])
+		)), $setting['privacy']['view']['profile'], 'select');
 		showsetting('setting_home_privacy_view_friend', array('settingnew[privacy][view][friend]', array(
 			array(0, $lang['setting_home_privacy_alluser']),
 			array(1, $lang['setting_home_privacy_friend']),
diff --git a/upload/source/include/space/space_profile.php b/upload/source/include/space/space_profile.php
index ed65dfb10..0b3fa10c0 100644
--- a/upload/source/include/space/space_profile.php
+++ b/upload/source/include/space/space_profile.php
@@ -10,6 +10,9 @@
 if(!defined('IN_DISCUZ')) {
 	exit('Access Denied');
 }
+if(!$_G['uid'] && $_G['setting']['privacy']['view']['profile']) {
+	showmessage('home_no_privilege', '', array(), array('login' => true));
+}
 
 require_once libfile('function/spacecp');
 
@@ -86,7 +89,14 @@ if(strtotime($space['regdate']) + $space['oltime'] * 3600 > TIMESTAMP) {
 }
 require_once libfile('function/friend');
 $isfriend = friend_check($space['uid'], 1);
-
+if(!$_G['adminid']){
+	if($_G['setting']['privacy']['view']['profile'] == 1 && !$isfriend) {
+		showmessage('specified_user_is_not_your_friend', '', array(), array());
+	}
+	if($_G['setting']['privacy']['view']['profile'] == 2 && !$space['self']) {
+		showmessage('is_blacklist', '', array(), array());
+	}
+}
 loadcache('profilesetting');
 include_once libfile('function/profile');
 $profiles = array();
diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php
index caadf18b8..d54a036d8 100644
--- a/upload/source/language/lang_admincp.php
+++ b/upload/source/language/lang_admincp.php
@@ -4352,6 +4352,8 @@ $lang = array
 	'usergroups_edit_credit_exempt_outperm' => '管辖版块外',
 
 	'usergroups_edit_home' => '空间相关',
+	'usergroups_edit_home_allow_viewprofile' => '允许查看用户资料',
+	'usergroups_edit_home_allow_viewprofile_comment' => '设置是否允许查看其他用户的资料信息',
 	'usergroups_edit_home_allow_blog' => '发表日志',
 	'usergroups_edit_home_allow_blog_mod' => '发表日志需要审核',
 	'usergroups_edit_home_allow_doing' => '发表记录',
-- 
Gitee