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

Merge pull request #21 from kijin/fix/say-no-to-big-brother

Browse source 
설치환경 수집 기능 삭제
This commit is contained in:
Kijin Sung 2016-01-05 09:36:53 +09:00
commit 1a8b5c8b29
2 changed files with 0 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/admin/admin.admin.view.php
View file

@ -84,7 +84,6 @@ class adminAdminView extends admin
Context::set('https_port', $db_info->https_port); Context::set('https_port', $db_info->https_port);
} }
$this->showSendEnv();
$this->checkEasyinstall(); $this->checkEasyinstall();
} }
@ -390,16 +389,6 @@ class adminAdminView extends admin
$oSecurity = new Security(); $oSecurity = new Security();
$oSecurity->encodeHTML('module_list..', 'module_list..author..', 'newVersionList..'); $oSecurity->encodeHTML('module_list..', 'module_list..author..', 'newVersionList..');
// gathering enviroment check
$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
$isEnviromentGatheringAgreement = FALSE;
if(file_exists($path))
{
$isEnviromentGatheringAgreement = TRUE;
}
Context::set('isEnviromentGatheringAgreement', $isEnviromentGatheringAgreement);
// license agreement check // license agreement check
$isLicenseAgreement = FALSE; $isLicenseAgreement = FALSE;
$path = FileHandler::getRealPath('./files/env/license_agreement'); $path = FileHandler::getRealPath('./files/env/license_agreement');
@ -524,46 +513,6 @@ class adminAdminView extends admin
$this->setTemplateFile('admin_setup'); $this->setTemplateFile('admin_setup');
} }
/**
* Enviroment information send to XE collect server
* @return void
*/
function showSendEnv()
{
if(Context::getResponseMethod() != 'HTML')
{
return;
}
$server = 'http://collect.xpressengine.com/env/img.php?';
$path = './files/env/';
$install_env = $path . 'install';
$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
if(file_exists(FileHandler::getRealPath($install_env)))
{
$oAdminAdminModel = getAdminModel('admin');
$params = $oAdminAdminModel->getEnv('INSTALL');
$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
Context::addHtmlFooter($img);
FileHandler::writeFile($path . $mainVersion, '1');
}
else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
{
if($_SESSION['enviroment_gather'] == 'Y')
{
$oAdminAdminModel = getAdminModel('admin');
$params = $oAdminAdminModel->getEnv();
$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
Context::addHtmlFooter($img);
}
FileHandler::writeFile($path . $mainVersion, '1');
unset($_SESSION['enviroment_gather']);
}
}
/** /**
* Retrun server environment to XML string * Retrun server environment to XML string
* @return object * @return object

12
modules/admin/tpl/index.html
View file

@ -38,18 +38,6 @@
</div> </div>
</form> </form>
<form action="./" method="post" class="message info x_clearfix" cond="!$isEnviromentGatheringAgreement">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procAdminEnviromentGatheringAgreement" />
<input type="hidden" name="xe_validator_id" value="modules/admin/tpl/index/1" />
<h2>{$lang->install_env_agreement}</h2>
<p>{$lang->install_env_agreement_desc}</p>
<div class="x_btn-group x_pull-right" style="margin-bottom:10px">
<button type="submit" name="is_agree" value="false" class="x_btn x_btn-small">{$lang->disagree}</button>
<button type="submit" name="is_agree" value="true" class="x_btn x_btn-small x_btn-primary">{$lang->agree}</button>
</div>
</form>
<div class="message update" cond="$addTables || $needUpdate"> <div class="message update" cond="$addTables || $needUpdate">
<h2 cond="$needUpdate && $addTables">{$lang->need_update_and_table}</h2> <h2 cond="$needUpdate && $addTables">{$lang->need_update_and_table}</h2>
<h2 cond="$needUpdate && !$addTables">{$lang->need_update}</h2> <h2 cond="$needUpdate && !$addTables">{$lang->need_update}</h2>