fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2044 remove agreement whene install.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11006 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-08-09 01:52:26 +00:00
parent 2511d1c01e
commit 8129169c60
5 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/install/conf/module.xml
View file

@ -9,7 +9,6 @@
<action name="dispInstallDBForm" type="view" standalone="true" /> <action name="dispInstallDBForm" type="view" standalone="true" />
<action name="dispInstallConfigForm" type="view" standalone="true" /> <action name="dispInstallConfigForm" type="view" standalone="true" />
<action name="dispInstallManagerForm" type="view" standalone="true" /> <action name="dispInstallManagerForm" type="view" standalone="true" />
<action name="procInstallAgreement" type="controller" standalone="true" />
<action name="procCubridDBSetting" type="controller" standalone="true" ruleset="cubrid" /> <action name="procCubridDBSetting" type="controller" standalone="true" ruleset="cubrid" />
<action name="procFirebirdDBSetting" type="controller" standalone="true" ruleset="firebird" /> <action name="procFirebirdDBSetting" type="controller" standalone="true" ruleset="firebird" />
<action name="procMssqlDBSetting" type="controller" standalone="true" ruleset="mssql" /> <action name="procMssqlDBSetting" type="controller" standalone="true" ruleset="mssql" />

20
modules/install/install.controller.php
View file

@ -22,26 +22,6 @@
$this->etc_tmp_config_file = _XE_PATH_.'files/config/tmpEtc.config.php'; $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... * @brief cubrid db setting wrapper, becase Server Side Validator...
* Server Side Validatro can use only one proc, one ruleset * Server Side Validatro can use only one proc, one ruleset

1
modules/install/install.view.php
View file

@ -50,6 +50,7 @@
} }
} }
Context::set('l', Context::getLangType());
$this->setTemplateFile('introduce'); $this->setTemplateFile('introduce');
} }

10
modules/install/tpl/filter/introduce.xml
View file

@ -1,10 +0,0 @@
<filter name="introduce" module="install" act="procInstallAgreement">
<form>
<node target="lgpl_agree" required="true" />
<node target="enviroment_gather" required="false" />
</form>
<response callback_func="completeAgreement">
<tag name="error" />
<tag name="message" />
</response>
</filter>

10
modules/install/tpl/introduce.html
View file

@ -4,11 +4,7 @@
<include target="progress_menu.html" /> <include target="progress_menu.html" />
<span class="dummy"></span> <span class="dummy"></span>
<div id="content"> <div id="content">
<form action="./" class="agreement" method="post"> <div class="agreement">
<input type="hidden" name="module" value="install" />
<input type="hidden" name="act" value="procInstallAgreement" /> <!-- UX/Remove -->
<input type="hidden" name="lgpl_agree" value="Y" /> <!-- UX/Remove -->
<input type="hidden" name="enviroment_gather" value="N" /> <!-- UX/Remove -->
<div class="desc"> <div class="desc">
<ul style="list-style:none"> <ul style="list-style:none">
<li loop="$lang_supported=>$key,$val" style="position:relative; margin:0 0 4px 0"> <li loop="$lang_supported=>$key,$val" style="position:relative; margin:0 0 4px 0">
@ -20,10 +16,10 @@
</div> </div>
<div class="ibtnArea"> <div class="ibtnArea">
<div class="fRight"> <div class="fRight">
<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_next}" /></span> <span class="ibtn icon"><span class="check"></span> <a href="{getUrl('', 'act', 'dispInstallCheckEnv')}" >{$lang->cmd_next}</a></span>
</div> </div>
</div> </div>
</form> </div>
</div> </div>
</div> </div>
<include target="footer.html" /> <include target="footer.html" />