diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /modules-available/sysconfig | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'modules-available/sysconfig')
5 files changed, 9 insertions, 6 deletions
diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php index b855761a..2949928b 100644 --- a/modules-available/sysconfig/addmodule_adauth.inc.php +++ b/modules-available/sysconfig/addmodule_adauth.inc.php @@ -108,7 +108,7 @@ class AdAuth_SelfSearch extends AddModule_Base $bindpw = Request::post('bindpw'); $ssl = Request::post('ssl', 'off') === 'on'; if ($ssl && !Request::post('fingerprint')) { - Message::addError('error-read', 'fingerprint'); + Message::addError('main.error-read', 'fingerprint'); AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render() return; } diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php index a6ac145c..d7122001 100644 --- a/modules-available/sysconfig/addmodule_ldapauth.inc.php +++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php @@ -96,7 +96,7 @@ class LdapAuth_CheckCredentials extends AddModule_Base $bindpw = Request::post('bindpw'); $ssl = Request::post('ssl', 'off') === 'on'; if ($ssl && !Request::post('fingerprint')) { - Message::addError('error-read', 'fingerprint'); + Message::addError('main.error-read', 'fingerprint'); AddModule_Base::setStep('LdapAuth_Start'); // Continues with LdapAuth_Start for render() return; } diff --git a/modules-available/sysconfig/addmodule_sshconfig.inc.php b/modules-available/sysconfig/addmodule_sshconfig.inc.php index 79857085..19272c32 100644 --- a/modules-available/sysconfig/addmodule_sshconfig.inc.php +++ b/modules-available/sysconfig/addmodule_sshconfig.inc.php @@ -45,7 +45,11 @@ class SshConfig_Finish extends AddModule_Base Util::redirect('?do=SysConfig&action=addmodule&step=SshConfig_Start'); } $module->setData('allowPasswordLogin', Request::post('allowPasswordLogin') === 'yes'); - if (!$module->setData('listenPort', Request::post('listenPort'))) { + $port = Request::post('listenPort', ''); + if ($port === '') { + $port = 22; + } + if (!$module->setData('listenPort', $port)) { Message::addError('main.value-invalid', 'port', Request::post('listenPort')); Util::redirect('?do=SysConfig&action=addmodule&step=SshConfig_Start'); } diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php index 0b7bbc1b..35697d1f 100644 --- a/modules-available/sysconfig/install.inc.php +++ b/modules-available/sysconfig/install.inc.php @@ -34,7 +34,8 @@ $res[] = tableCreate('configtgz_x_module', " // Constraints if (in_array(UPDATE_DONE, $res)) { Database::exec("ALTER TABLE `configtgz_x_module` - ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) ON DELETE CASCADE, + ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) ON DELETE CASCADE"); + Database::exec("ALTER TABLE `configtgz_x_module` ADD CONSTRAINT `configtgz_x_module_ibfk_2` FOREIGN KEY (`moduleid`) REFERENCES `configtgz_module` (`moduleid`)"); } diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php index efe34136..121e4cee 100644 --- a/modules-available/sysconfig/page.inc.php +++ b/modules-available/sysconfig/page.inc.php @@ -106,8 +106,6 @@ class Page_SysConfig extends Page */ protected function doRender() { - Render::setTitle(Dictionary::translate('lang_location')); - $action = Request::any('action', 'list'); switch ($action) { case 'addmodule': |