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

issue 72 Sending server environment information after agreement of xe admin user.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8581 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2011-07-08 07:45:51 +00:00
parent cb13f541e8
commit e0c298d958
7 changed files with 104 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,14 @@
{
global $lang;
$requestVars = Context::gets('lgpl_agree', 'enviroment_gather');
if($requestVars->lgpl_agree != 'on')
if($requestVars->lgpl_agree != 'Y') {
return new Object('-1', $lang->msg_license_agreement_alert);
}
$_SESSION['lgpl_agree'] = $requestVars->lgpl_agree;
$_SESSION['enviroment_gather'] = $requestVars->enviroment_gather;
if($requestVars->enviroment_gather=='Y') {
FileHandler::writeFile('./files/env/install','1');
}
$url = getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
header('location:'.$url);
@ -183,6 +186,12 @@
// Display a message that installation is completed
$this->setMessage('msg_install_completed');
if($_SESSION['enviroment_gather'] == 'Y'){
$oAdminAdminController = &getAdminController('admin');
$oAdminAdminController->_sendServerEnv();
unset($_SESSION['enviroment_gather']);
}
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
header('location:'.$returnUrl);
@ -517,4 +526,3 @@
}
}
?>

2
modules/install/install.model.php
View file

@ -1,8 +1,6 @@
<?php
class installModel extends install {
function init() {
}
var $pwd;
function getSFTPList()

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

@ -8,11 +8,11 @@
<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><input type="checkbox" name="lgpl_agree" value="Y" 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>
</div>
<div class="desc">
<p><input type="checkbox" name="enviroment_gather" class="iCheck" id="env" /> <label for="env">{$lang->intall_env_agreement}</label></p>
<p><input type="checkbox" name="enviroment_gather" value="Y" class="iCheck" id="env" /> <label for="env">{$lang->intall_env_agreement}</label></p>
<p>{$lang->intall_env_agreement_desc}</p>
</div>
<div class="btnArea">