Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix makefile.

Browse Source
This commit is contained in:
Yagami
2019-01-23 15:56:03 +08:00
parent 2ced50d58a
commit 9fef22ee4c
3 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -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

33
xuanxuan/module/chat/ext/model/class/xuanxuan.class.php
View File

@@ -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;
}
}

6
xuanxuan/module/chat/ext/model/xuanxuan.php
View File

@@ -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);
}