Преглед изворни кода

for create and invite push

stanley-king пре 6 година
родитељ
комит
952cca2d00
3 измењених фајлова са 6 додато и 8 уклоњено
  1. 1 1
      helper/room/msg_builder.php
  2. 5 7
      mobile/control/member_talk.php
  3. BIN
      webacc

+ 1 - 1
helper/room/msg_builder.php

@@ -27,7 +27,7 @@ class msg_builder
         $msg['body']['op'] = 'create';
         $msg['body']['msgtype'] = "message";
         $msg['body']['room'] = $roomid;
-        $msg['body']['info'] = $info;
+        $msg['body']['room_info'] = $info;
 
         return $msg;
     }

+ 5 - 7
mobile/control/member_talk.php

@@ -14,8 +14,6 @@ require_once(BASE_ROOT_PATH . '/helper/room/author.php');
 require_once(BASE_ROOT_PATH . '/helper/room/util.php');
 require_once(BASE_ROOT_PATH . '/helper/room/tpl_group_home.php');
 
-use \room\proto_type;
-
 class member_talkControl extends mbMemberControl
 {
     const max_msgid = 1 << 32;
@@ -66,7 +64,7 @@ class member_talkControl extends mbMemberControl
         if($stCreator == 0) {
             $mod_room = Model('room');
             $params = $mod_room->getRoom($room_id);
-            $rinfo = new room\base_info($params);
+            $rinfo = new room\room_info($params);
             $stCreator = $rinfo->creator();
         }
 
@@ -189,7 +187,7 @@ class member_talkControl extends mbMemberControl
         $result = [];
         foreach ($msgs as $msg)
         {
-            $msgtype = proto_type::from_msgtype(intval($msg['type']));
+            $msgtype = room\proto_type::from_msgtype(intval($msg['type']));
             if($msgtype == false) continue;
 
             $val = [];
@@ -422,11 +420,11 @@ class member_talkControl extends mbMemberControl
         if($room_id<=0) return self::outerr(errcode::ErrParamter);
 
         $self = session_helper::memberid();
-        $items = \room\room_helper::room_uids($room_id);
+        $items = room\room_helper::room_uids($room_id);
         if(empty($items)) return self::outerr(errcode::ErrTalk);
 
-        $uids = \room\members::uids_filter($items,$self);
-        $members = \room\members::get_members($uids);
+        $uids = room\members::uids_filter($items,$self);
+        $members = room\members::get_members($uids);
 
         return self::outsuccess([
             'friends' => $uids,