fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

#19790379 license agreement validate

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8406 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-30 09:38:41 +00:00
parent 2cca2a7913
commit 9f92763988
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,15 +27,11 @@
**/ **/
function procInstallAgreement() function procInstallAgreement()
{ {
global $lang;
$requestVars = Context::gets('lgpl_agree', 'enviroment_gather'); $requestVars = Context::gets('lgpl_agree', 'enviroment_gather');
if($requestVars->lgpl_agree != 'on')
return new Object('-1', $lang->msg_license_agreement_alert);
/*$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
$buff .= sprintf("\$agreement->%s = '%s';\n", 'lgpl_agree', $requestVars->lgpl_agree);
$buff .= sprintf("\$agreement->%s = '%s';\n", 'enviroment_gather', $requestVars->enviroment_gather);
$buff .= "?>";
$this->db_tmp_config_file = _XE_PATH_.'files/config/tmpDB.config.php';
FileHandler::writeFile(_XE_PATH_.'files/config/agreement', $buff);*/
$_SESSION['lgpl_agree'] = $requestVars->lgpl_agree; $_SESSION['lgpl_agree'] = $requestVars->lgpl_agree;
$_SESSION['enviroment_gather'] = $requestVars->enviroment_gather; $_SESSION['enviroment_gather'] = $requestVars->enviroment_gather;

9
modules/install/tpl/js/install_admin.js
View file

@ -3,8 +3,13 @@
*/ */
function completeAgreement(ret_obj) function completeAgreement(ret_obj)
{ {
var url = current_url.setQuery('act', 'dispInstallCheckEnv'); if(ret_obj['error'] != 0) {
location.href = url; alert(ret_obj['message']);
return;
} else {
var url = current_url.setQuery('act', 'dispInstallCheckEnv');
location.href = url;
}
} }
function completeDBSetting(ret_obj) { function completeDBSetting(ret_obj) {