diff --git a/Makefile b/Makefile index a040894b5b..b53a1c6e0d 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php index ae7ab7d0b7..648a51fdb9 100755 --- a/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php +++ b/xuanxuan/module/misc/ext/control/ajaxsetclientconfig.php @@ -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';