issue 33 install introduce page, not progress next step

proc filter not use


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8487 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/install/install.controller.php

@@ -35,7 +35,8 @@
 			$_SESSION['lgpl_agree'] = $requestVars->lgpl_agree;
 			$_SESSION['enviroment_gather'] = $requestVars->enviroment_gather;
 
-			return new Object(0, 'success');
+			$url = getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
+			header('location:'.$url);
 		}
 
 		/**

modules/install/lang/ko.lang.php

@@ -26,6 +26,9 @@
             'session' => 'Session.auto_start 설정',
             'db' => 'DB',
         );
+	$lang->install_license_desc = array(
+			'lgpl' => 'GNU 약소 일반 공중 사용 허가서(LGPL v2)에 동의해야 합니다.'
+		);
     $lang->install_checklist_desc = array(
             'php_version' => '[필수] PHP버전이 5.2.2일 경우 PHP의 버그로 인하여 설치되지 않습니다.',
             'permission' => '[필수] XE의 설치 경로 또는 ./files 디렉토리의 퍼미션이 707이어야 합니다.',

modules/install/tpl/introduce.html

@@ -1,11 +1,12 @@
-<!--%import("filter/introduce.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
 	<div id="body">
 <!--#include("progress_menu.html")-->
 		<span class="dummy"></span>
 		<div id="content">
-			<form action="./" class="agreement" method="post" onsubmit="return procFilter(this, introduce)">
+			<form action="./" class="agreement" method="post">
+			<input type="hidden" name="act" value="procInstallAgreement" />
+			<input type="hidden" id="agree_license_text" value="{$lang->install_license_desc['lgpl']}" />
 				<div class="desc">
 					<p><input type="checkbox" name="lgpl_agree" class="iCheck" id="lgpl" /> <label for="lgpl">{$lang->lgpl_agree}</label> - <a href="{$lang->lgpl_license_url}" target="_blank">{$lang->read_all}</a></p>
 					<p>{$lang->license_agreement_desc}</p>

modules/install/tpl/js/install.js

@@ -3,7 +3,7 @@ jQuery(function($){
 	var agree = $('.agreement');
 	agree.submit(function(){
 		if($('#lgpl:checked').length==0){
-			alert('{$lang->msg_license_agreement_alert}');
+			alert($('#agree_license_text').val());
 			$('#lgpl').focus();
 			return false;
 		}
@@ -95,4 +95,4 @@ jQuery(function($){
 	select_input.change(set_label).focus(set_label);
 	select_label.hover(i_hover).click(hide_option);
 	
-});
+});