From 32621386ab6d89ebecb9265fef76d52b389dda75 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 6 Jun 2019 14:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E8=B5=9E=E5=90=8E?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0cookie=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dingmail/controllers/index.php            | 20 +++++--------------
 .../dingmail/views/rank_person.php            |  6 +++---
 webht/third_party/dingmail/views/user.php     |  2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/webht/third_party/dingmail/controllers/index.php b/webht/third_party/dingmail/controllers/index.php
index 8e59164a..02f0b382 100644
--- a/webht/third_party/dingmail/controllers/index.php
+++ b/webht/third_party/dingmail/controllers/index.php
@@ -53,6 +53,7 @@ class Index extends CI_Controller {
 				 if($unionid == null){
 					 $unionid = get_cookie('dingunionid');
 				 }
+				 
 				 $mdata['user'] = $this->ding_value_model->get_dingding_user($unionid);
 				 $mdata['user_unionid'] = $unionid;
 				 $mdata['like_count'] = $this->ding_value_model->count_like($unionid);
@@ -61,26 +62,15 @@ class Index extends CI_Controller {
 				 $mdata['whos_unlike'] = $this->ding_value_model->whos_unlike($unionid);
 				 $mdata['all_comment'] = $this->ding_value_model->all_comment($unionid);
 				 //print_r($this->session->userdata('dingding_user_info'));
-				 $this->session->set_userdata('dingding_user_info', $mdata['user']);
+				 //如果传入的unionid和cookie的相等就再存一个userinfo的cookie，访问个人主页，反之不存就是访问他人主页
+				 if($unionid == get_cookie('dingunionid')){
+					 $this->session->set_userdata('dingding_user_info', $mdata['user']);
+				 }
 				 $this->load->view('user',$mdata);
 			 }
 		}
 	 }
 	 
-	 //访问他人主页
-	 public function otherdetail($unionid){
-		 $mdata['user'] = $this->ding_value_model->get_dingding_user($unionid);
-		 $mdata['user_unionid'] = $unionid;
-		 $mdata['like_count'] = $this->ding_value_model->count_like($unionid);
-		 $mdata['unlike_count'] = $this->ding_value_model->count_unlike($unionid);
-		 $mdata['whos_like'] = $this->ding_value_model->whos_like($unionid);
-		 $mdata['whos_unlike'] = $this->ding_value_model->whos_unlike($unionid);
-		 $mdata['all_comment'] = $this->ding_value_model->all_comment($unionid);
-		 //print_r($this->session->userdata('dingding_user_info'));
-		 $this->load->view('user',$mdata);
-	 }
-	 
-	 
 	//value邮件页面
 	public function mail_index(){
 		 if($this->session->userdata('dingding_user_info') === false){
diff --git a/webht/third_party/dingmail/views/rank_person.php b/webht/third_party/dingmail/views/rank_person.php
index ae946c9a..398936e6 100644
--- a/webht/third_party/dingmail/views/rank_person.php
+++ b/webht/third_party/dingmail/views/rank_person.php
@@ -73,7 +73,7 @@
 		      	<li class="col-xs-24 nopadding">
 		      		<span class="text-danger<?php echo $key_rw+1; ?>">No.<?php echo $key_rw+1; ?></span>
 		      		<span> 
-		      		<a href="<?php echo site_url('apps/dingmail/index/otherdetail/'.$rw->ddv_Comment_Unionid); ?>">
+		      		<a href="<?php echo site_url('apps/dingmail/index/index/'.$rw->ddv_Comment_Unionid); ?>">
 		      			<?php echo $rw->ddv_Comment_Name; ?>
 		      		</a>
 		      		</span>
@@ -125,7 +125,7 @@
 		      	<li class="col-xs-24 nopadding">
 		      		<span class="text-danger<?php echo $key_rm+1; ?>">No.<?php echo $key_rm+1; ?></span> 
 		      		<span> 
-		      		<a href="<?php echo site_url('apps/dingmail/index/otherdetail/'.$rm->ddv_Comment_Unionid); ?>">
+		      		<a href="<?php echo site_url('apps/dingmail/index/index/'.$rm->ddv_Comment_Unionid); ?>">
 		      			<?php echo $rm->ddv_Comment_Name; ?>
 		      		</a>
 		      		</span>
@@ -159,7 +159,7 @@
 		      	<li class="col-xs-24 nopadding">
 		      		<span class="text-danger<?php echo $key_ry+1; ?>">No.<?php echo $key_ry+1; ?></span> 
 		      		<span> 
-		      		<a href="<?php echo site_url('apps/dingmail/index/otherdetail/'.$ry->ddv_Comment_Unionid); ?>">
+		      		<a href="<?php echo site_url('apps/dingmail/index/index/'.$ry->ddv_Comment_Unionid); ?>">
 		      			<?php echo $ry->ddv_Comment_Name; ?>
 		      		</a>
 		      		</span>
diff --git a/webht/third_party/dingmail/views/user.php b/webht/third_party/dingmail/views/user.php
index d54f9c0e..3364dc35 100644
--- a/webht/third_party/dingmail/views/user.php
+++ b/webht/third_party/dingmail/views/user.php
@@ -169,7 +169,7 @@
 					<?php if($value->ddv_Type == 'hidden_comment'){
 						echo $value->ddv_Name;
 					}else{?>
-					<a href="http://www.mycht.cn/webht.php/apps/dingmail/index/otherdetail/<?php echo $value->ddv_User_Unionid?>"><?php echo $value->ddv_Name?></a>
+					<a href="http://www.mycht.cn/webht.php/apps/dingmail/index/index/<?php echo $value->ddv_User_Unionid?>"><?php echo $value->ddv_Name?></a>
 					<?php }?>
 					</p>
 					<?php if($value->ddv_Content == 'like' || $value->ddv_Content == 'unlike' ){ ?>