diff options
| author | Simon Rettberg | 2014-10-27 16:17:10 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-10-27 16:17:10 +0100 |
| commit | f63f6979532b7a7be20f719bb7028c5f04275e2e (patch) | |
| tree | dfa1ecb78ff2e77adcb0997336521b1fb53578b0 /modules/sysconfig/addmodule_ad.inc.php | |
| parent | Update translations (diff) | |
| download | slx-admin-f63f6979532b7a7be20f719bb7028c5f04275e2e.tar.gz slx-admin-f63f6979532b7a7be20f719bb7028c5f04275e2e.tar.xz slx-admin-f63f6979532b7a7be20f719bb7028c5f04275e2e.zip | |
Update AD proxy module generation, add config backup
Diffstat (limited to 'modules/sysconfig/addmodule_ad.inc.php')
| -rw-r--r-- | modules/sysconfig/addmodule_ad.inc.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/sysconfig/addmodule_ad.inc.php b/modules/sysconfig/addmodule_ad.inc.php index 3afe3972..4c529b72 100644 --- a/modules/sysconfig/addmodule_ad.inc.php +++ b/modules/sysconfig/addmodule_ad.inc.php @@ -16,6 +16,7 @@ class AdModule_Start extends AddModule_Base Session::save(); Render::addDialog(Dictionary::translate('lang_adAuthentication'), false, 'sysconfig/ad-start', array( 'step' => 'AdModule_CheckConnection', + 'title' => Request::post('title'), 'server' => Request::post('server'), 'searchbase' => Request::post('searchbase'), 'binddn' => Request::post('binddn'), @@ -82,6 +83,7 @@ class AdModule_CheckConnection extends AddModule_Base protected function renderInternal() { Render::addDialog(Dictionary::translate('lang_adAuthentication'), false, 'sysconfig/ad-checkconnection', array_merge($this->taskIds, array( + 'title' => Request::post('title'), 'server' => Request::post('server'), 'searchbase' => Request::post('searchbase'), 'binddn' => Request::post('binddn'), @@ -117,8 +119,10 @@ class AdModule_Finish extends AddModule_Base } $searchbase = mb_substr($binddn, $i + 1); } - $config = ConfigModule::insertAdConfig('AD: ' . Request::post('server'), Request::post('server'), $searchbase, $binddn, Request::post('bindpw', ''), Request::post('home', '') - ); + $title = Request::post('title'); + if (empty($title)) + $title = 'AD: ' . Request::post('server'); + $config = ConfigModule::insertAdConfig($title, Request::post('server'), $searchbase, $binddn, Request::post('bindpw', ''), Request::post('home', '')); $config['proxyip'] = Property::getServerIp(); $tgz = Taskmanager::submit('CreateAdConfig', $config); if (!isset($tgz['id'])) { @@ -132,8 +136,7 @@ class AdModule_Finish extends AddModule_Base protected function renderInternal() { - Render::addDialog(Dictionary::translate('lang_adAuthentication'), false, 'sysconfig/ad-finish', $this->taskIds - ); + Render::addDialog(Dictionary::translate('lang_adAuthentication'), false, 'sysconfig/ad-finish', $this->taskIds); } } |