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

* adjust for xuanxuan.

Browse Source
This commit is contained in:
wangyidong
2020-03-24 15:58:44 +08:00
parent 7f99fab3a7
commit fe4cd3fd3e
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
-1
View File
@@ -66,7 +66,6 @@ zentaoxx:
cp -r xuan/xxb/module/client zentaoxx/module/
cp -r xuan/xxb/module/license zentaoxx/module/
cp -r xuan/xxb/module/owt zentaoxx/module/
cp xuan/xxb/apischeme.json zentaoxx/
mkdir -p zentaoxx/module/common/view
cp -r xuan/xxb/module/common/view/header.modal.html.php zentaoxx/module/common/view
cp -r xuan/xxb/module/common/view/marked.html.php zentaoxx/module/common/view
xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php
+14 -6
View File
@@ -19,12 +19,20 @@ class myMisc extends misc
/* write login info into config file. */
$loginInfo = new stdclass();
$loginInfo->ui = new stdclass();
$loginInfo->ui->defaultUser = new stdclass();
$loginInfo->ui->defaultUser->server = common::getSysURL();;
$loginInfo->ui->defaultUser->account = $this->app->user->account;
$loginInfo->ui->defaultUser->lock = false;
$loginInfo->ui->defaultUser->ldap = true;
$loginInfo->ui = array();
$loginInfo->ui['defaultUser']['server'] = common::getSysURL();;
$loginInfo->ui['defaultUser']['account'] = $this->app->user->account;
$loginInfo->ui['defaultUser']['lock'] = false;
$loginInfo->ui['defaultUser']['ldap'] = false;
$loginInfo->ui['login.ldap'] = true;
$ldapPath = $this->app->getModulePath('', 'ldap');
if(is_dir($ldapPath))
{
$ldapTurnon = $this->dao->select('*')->from(TABLE_CONFIG)->where('owner')->eq('system')->andWhere('module')->eq('ldap')->andWhere('`key`')->eq('turnon')->fetch('value');
$loginInfo->ui['defaultUser']['ldap'] = !empty($ldapTurnon);
}
$loginInfo = json_encode($loginInfo);
$loginFile = $clientDir . 'config.json';