diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml index cc8ba1af0..149ea745e 100644 --- a/modules/install/conf/module.xml +++ b/modules/install/conf/module.xml @@ -9,7 +9,6 @@ - diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 7143b7cd3..6fbc9a6cf 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -22,26 +22,6 @@ $this->etc_tmp_config_file = _XE_PATH_.'files/config/tmpEtc.config.php'; } - /** - * @brief LGPL, Enviroment gathering agreement - **/ - function procInstallAgreement() - { - global $lang; - $requestVars = Context::gets('lgpl_agree', 'enviroment_gather'); - if($requestVars->lgpl_agree != 'Y') { - return new Object('-1', $lang->msg_license_agreement_alert); - } - - $_SESSION['lgpl_agree'] = $requestVars->lgpl_agree; - if($requestVars->enviroment_gather=='Y') { - FileHandler::writeFile('./files/env/install','1'); - } - - $url = getNotEncodedUrl('', 'act', 'dispInstallCheckEnv'); - header('location:'.$url); - } - /** * @brief cubrid db setting wrapper, becase Server Side Validator... * Server Side Validatro can use only one proc, one ruleset diff --git a/modules/install/install.view.php b/modules/install/install.view.php index dfa015e94..1e9e34640 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -50,6 +50,7 @@ } } + Context::set('l', Context::getLangType()); $this->setTemplateFile('introduce'); } diff --git a/modules/install/tpl/filter/introduce.xml b/modules/install/tpl/filter/introduce.xml deleted file mode 100644 index ee9c9843d..000000000 --- a/modules/install/tpl/filter/introduce.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
- - - - - - - -
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html index 2fe78c096..b39610b9b 100644 --- a/modules/install/tpl/introduce.html +++ b/modules/install/tpl/introduce.html @@ -4,11 +4,7 @@
-
- - - - +
  • @@ -20,10 +16,10 @@
- +