diff --git a/Makefile b/Makefile index 8b25a6594f..2626ff6ff6 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ zentaoxx: sed -i '/password = md5/d' zentaoxx/module/chat/control.php sed -i '/getSignedTime/d' zentaoxx/module/chat/control.php sed -i 's/tree/dept/' zentaoxx/module/chat/control.php + sed -i 's/tree/dept/' zentaoxx/module/chat/model.php sed -i "s/, 'sys'//" zentaoxx/module/chat/control.php sed -i 's/system.sys/system/' zentaoxx/module/chat/control.php sed -i 's/&app=sys//' zentaoxx/module/chat/control.php diff --git a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php index 34238f806b..04d2de620b 100644 --- a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php +++ b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php @@ -65,37 +65,4 @@ class xuanxuanChat extends chatModel unset($_SESSION['user']); return $entries; } - - public function getUserListOutput($idList = array(), $userID) - { - $output = new stdclass(); - $output->module = 'chat'; - $output->method = 'userGetList'; - - $users = $this->getUserList($status = '', $idList, $idAsKey = false); - if(dao::isError()) - { - $output->result = 'fail'; - $output->message = 'Get userlist failed.'; - } - else - { - $output->result = 'success'; - $output->users = !empty($userID) ? array($userID) : array(); - $output->data = $users; - - $this->app->loadLang('user', 'sys'); - $roles = $this->lang->user->roleList; - - $allDepts = $this->loadModel('dept')->getListByType('dept'); - $depts = array(); - foreach($allDepts as $id => $dept) - { - $depts[$id] = array('name' => $dept->name, 'order' => (int)$dept->order, 'parent' => (int)$dept->parent); - } - $output->roles = $roles; - $output->depts = $depts; - } - return $output; - } } diff --git a/xuanxuan/module/chat/ext/model/xuanxuan.php b/xuanxuan/module/chat/ext/model/xuanxuan.php index 72adc1b3bd..dd3683e8b5 100644 --- a/xuanxuan/module/chat/ext/model/xuanxuan.php +++ b/xuanxuan/module/chat/ext/model/xuanxuan.php @@ -3,9 +3,3 @@ public function getExtensionList($userID) { return $this->loadExtension('xuanxuan')->getExtensionList($userID); } - -public function getUserListOutput($idList = array(), $userID) -{ - return $this->loadExtension('xuanxuan')->getUserListOutput($idList, $userID); -} -