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

#1051 license 동의 절차 추가

Browse source
This commit is contained in:
bnu 2014-12-01 16:21:34 +09:00
parent 8f0056b659
commit e3e1babcb1
12 changed files with 136 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -381,6 +381,16 @@ class adminAdminView extends admin
$isEnviromentGatheringAgreement = TRUE;
}
Context::set('isEnviromentGatheringAgreement', $isEnviromentGatheringAgreement);
// license agreement check
$isLicenseAgreement = FALSE;
$path = FileHandler::getRealPath('./files/env/license_agreement');
$isLicenseAgreement = FALSE;
if(file_exists($path))
{
$isLicenseAgreement = TRUE;
}
Context::set('isLicenseAgreement', $isLicenseAgreement);
Context::set('layout', 'none');
$this->setTemplateFile('index');
@ -515,7 +525,6 @@ class adminAdminView extends admin
$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
Context::addHtmlFooter($img);
FileHandler::removeDir($path);
FileHandler::writeFile($path . $mainVersion, '1');
}
else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
@ -528,7 +537,6 @@ class adminAdminView extends admin
Context::addHtmlFooter($img);
}
FileHandler::removeDir($path);
FileHandler::writeFile($path . $mainVersion, '1');
unset($_SESSION['enviroment_gather']);
}

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

@ -10,12 +10,29 @@
<div class="x_page-header">
<h1>{$lang->control_panel} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_dashboard" target="_blank">{$lang->help}</a></h1>
</div>
<div id="checkBrowserMessage" class="message error" style="display:none;">
<h2>{$lang->checkBrowserIE8}</h2>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="post" class="message info x_clearfix" cond="!$isLicenseAgreement">
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<input type="hidden" name="module" value="install" />
<input type="hidden" name="act" value="procInstallLicenseAggrement" />
<input type="hidden" name="license_agreement" value="Y" />
<input type="hidden" name="XE_VALIDATOR_ID" value="modules/admin/tpl/index/1">
<h2>{$lang->license_agreement}</h2>
<div>{$lang->license}</div>
<div class="x_btn-group x_pull-right" style="margin-bottom:10px">
<button type="submit" class="x_btn x_btn-small x_btn-primary" value="">{$lang->cmd_license_agree}</button>
</div>
</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" />
@ -27,17 +44,19 @@
<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">
<h2 cond="$needUpdate && $addTables">{$lang->need_update_and_table}</h2>
<h2 cond="$needUpdate && !$addTables">{$lang->need_update}</h2>
<h2 cond="!$needUpdate && $addTables">{$lang->need_table}</h2>
<ul>
<block loop="$module_list => $key,$value">
<li style="margin:0 0 4px 0" cond="$value->need_install">{$value->module} - <button type="button" onclick="doInstallModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_create_db_table}</button></li>
<li style="margin:0 0 4px 0" cond="$value->need_update">{$value->module} - <button type="button" onclick="doUpdateModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_module_update}</button></li>
</block>
<block loop="$module_list => $key,$value">
<li style="margin:0 0 4px 0" cond="$value->need_install">{$value->module} - <button type="button" onclick="doInstallModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_create_db_table}</button></li>
<li style="margin:0 0 4px 0" cond="$value->need_update">{$value->module} - <button type="button" onclick="doUpdateModule('{$value->module}')" class="x_btn x_btn-small">{$lang->cmd_module_update}</button></li>
</block>
</ul>
</div>
<div class="message update" cond="count($newVersionList)">
<h2>{$lang->available_new_version}</h2>
<ul>
@ -46,7 +65,7 @@
</li>
</ul>
</div>
<div class="dashboard">
<block cond="$counterAddonActivated">
<include target="./_dashboard_counter.html" />

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

@ -4,6 +4,7 @@
<permissions />
<actions>
<action name="dispInstallIntroduce" type="view" index="true" />
<action name="dispInstallLicenseAgreement" type="view" />
<action name="dispInstallCheckEnv" type="view" />
<action name="dispInstallSelectDB" type="view" />
<action name="dispInstallDBForm" type="view" />
@ -17,6 +18,7 @@
<action name="procSqliteDBSetting" type="controller" ruleset="sqlite" />
<action name="procConfigSetting" type="controller" ruleset="config" />
<action name="procInstall" type="controller" ruleset="install" />
<action name="procInstallLicenseAggrement" type="controller" />
<action name="procInstallFTP" type="controller" />
<action name="procInstallCheckFTP" type="controller" />
<action name="procInstallAdminInstall" type="controller" />

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

@ -9,6 +9,7 @@ class installController extends install
{
var $db_tmp_config_file = '';
var $etc_tmp_config_file = '';
var $flagLicenseAgreement = './files/env/license_agreement';
/**
* @brief Initialization
@ -377,6 +378,33 @@ class installController extends install
return $install_enable;
}
/**
* @brief License agreement
*/
function procInstallLicenseAggrement()
{
$vars = Context::getRequestVars();
$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
if($license_agreement)
{
$currentTime = $_SERVER['REQUEST_TIME'];
FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
}
else
{
FileHandler::removeFile($this->flagLicenseAgreement);
return new Object(-1, 'msg_must_accept_license_agreement');
}
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispInstallCheckEnv');
$this->setRedirectUrl($returnUrl);
}
}
/**
* check this server can use rewrite module
* make a file to files/config and check url approach by ".htaccess" rules

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

@ -79,6 +79,17 @@ class installView extends install
$this->setTemplateFile('introduce');
}
/**
* @brief License agreement
*/
function dispInstallLicenseAgreement()
{
$this->setTemplateFile('license_agreement');
$lang_type = Context::getLangType();
Context::set('lang_type', $lang_type);
}
/**
* @brief Display messages about installation environment
*/

4
modules/install/lang/lang.xml
View file

@ -31,6 +31,10 @@
<value xml:lang="tr"><![CDATA[Yükleme dilini seçin]]></value>
<value xml:lang="vi"><![CDATA[Chọn ngôn ngữ cài đặt]]></value>
</item>
<item name="license_agreement">
<value xml:lang="ko"><![CDATA[사용권 동의]]></value>
<value xml:lang="en"><![CDATA[License agreement]]></value>
</item>
<item name="condition">
<value xml:lang="ko"><![CDATA[설치 조건 확인]]></value>
<value xml:lang="en"><![CDATA[Check the installation conditions]]></value>

3
modules/install/tpl/check_env.html
View file

@ -34,9 +34,10 @@
<block cond="$use_nginx == 'Y'"><br> {$lang->about_nginx_rewrite}</block>
</p>
</div>
<div class="ibtnArea">
<span class="x_pull-left">
<a href="{getUrl('')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
<a href="{getUrl('', 'act','dispInstallLicenseAgreement')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
</span>
<span class="x_pull-right">
<a cond="$install_enable" class="x_btn x_btn-small x_btn-inverse" id="task-checklist-confirm" href="{getUrl('','act','dispInstallSelectDB')}">{$lang->cmd_install_next} <i class="x_icon-chevron-right x_icon-white"></i></a>

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

@ -12,7 +12,7 @@
</ul>
<div class="ibtnArea">
<span class="x_pull-right">
<a href="{getUrl('', 'act', 'dispInstallCheckEnv')}" class="x_btn x_btn-small x_btn-inverse" id="task-choose-language">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></a>
<a href="{getUrl('', 'act', 'dispInstallLicenseAgreement')}" class="x_btn x_btn-small x_btn-inverse" id="task-choose-language">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></a>
</span>
</div>
</div>

35
modules/install/tpl/license_agreement.html Normal file
View file

@ -0,0 +1,35 @@
<load target="js/install_admin.js" />
<include target="header.html" />
<div id="body">
<include target="progress_menu.html" />
<div id="content">
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h2>{$lang->license_agreement}</h2>
<form action="./" method="post" class="x_form-horizontal">
<input type="hidden" name="act" value="procInstallLicenseAggrement">
<input type="hidden" name="module" value="install">
<div class="content-license">
<div>{$lang->license}</div>
</div>
<div>
<label><input type="checkbox" name="license_agreement" value="Y" /> <strong>{$lang->cmd_license_agree}</strong></label>
</div>
<div class="ibtnArea">
<span class="x_pull-left">
<a href="/core-origin/" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
</span>
<span class="x_pull-right">
<button type="submit" class="x_btn x_btn-small x_btn-inverse" id="task-license-aggrement" value="">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></button>
</span>
</div>
</form>
</div>
</div>
<include target="footer.html" />

1
modules/install/tpl/progress_menu.html
View file

@ -1,6 +1,7 @@
<div id="progress">
<ul>
<li class="active"|cond="$act==''">{$lang->install_progress_menu['language']}</li>
<li class="active"|cond="$act=='dispInstallLicenseAgreement'">{$lang->install_progress_menu['license_agreement']}</li>
<li class="active"|cond="$act=='dispInstallCheckEnv'">{$lang->install_progress_menu['condition']}</li>
<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '3'">{$lang->install_progress_menu['ftp']}</li>
<li class="active"|cond="$act=='dispInstallSelectDB' && $progressMenu == '4'">{$lang->install_progress_menu['dbSelect']}</li>