|
@@ -103,7 +103,13 @@ class member_talkControl extends mbMemberControl
|
|
$result = $this->chatwomsg($msgid,$user);
|
|
$result = $this->chatwomsg($msgid,$user);
|
|
$msgs = $this->format_message($result['uids'],$result['msgs'],$type,$user);
|
|
$msgs = $this->format_message($result['uids'],$result['msgs'],$type,$user);
|
|
}
|
|
}
|
|
- else {
|
|
|
|
|
|
+// elseif($type == 'applys')
|
|
|
|
+// {
|
|
|
|
+// $result = $this->applysmsg($msgid);
|
|
|
|
+// $msgs = $result['msgs'];
|
|
|
|
+// }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
$msgs = [];
|
|
$msgs = [];
|
|
Log::record(__METHOD__ . " : invalid type={$type}.",Log::ERR);
|
|
Log::record(__METHOD__ . " : invalid type={$type}.",Log::ERR);
|
|
}
|
|
}
|
|
@@ -233,8 +239,14 @@ class member_talkControl extends mbMemberControl
|
|
return ['uids' => [$left,$right],'msgs' => $msgs];
|
|
return ['uids' => [$left,$right],'msgs' => $msgs];
|
|
}
|
|
}
|
|
|
|
|
|
- private function applysmsg($msgid,$user){
|
|
|
|
-
|
|
|
|
|
|
+ private function applysmsg($msgid){
|
|
|
|
+ $mod_room = Model('room');
|
|
|
|
+ $user = session_helper::memberid();
|
|
|
|
+ $msgs = $mod_room->getRoomsgList(["member_id"=>$user,"type"=>proto_type::msg_type_apply], $this->page_size);
|
|
|
|
+ if($msgs){
|
|
|
|
+ usort($msgs,['room\sorter','msgid_asc']);
|
|
|
|
+ }
|
|
|
|
+ return ['msgs' => $msgs];
|
|
}
|
|
}
|
|
|
|
|
|
public function create_roomOp()
|
|
public function create_roomOp()
|