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

Merge branch 'release/1.7.8' into develop

Browse source 
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/admin/admin.admin.controller.php
View file

@ -61,6 +61,9 @@ class adminAdminController extends admin
FileHandler::rename('./files/cache', $temp_cache_dir);
FileHandler::makeDir('./files/cache');
// remove module extend cache
FileHandler::removeFile(_XE_PATH_ . 'files/config/module_extend.php');
// remove debug files
FileHandler::removeFile(_XE_PATH_ . 'files/_debug_message.php');
FileHandler::removeFile(_XE_PATH_ . 'files/_debug_db_query.php');

4
modules/admin/admin.admin.model.php
View file

@ -947,7 +947,6 @@ class adminAdminModel extends admin
function iconUrlCheck($iconname, $default_icon_name)
{
$site_info = Context::get('site_module_info');
$virtual_site = '';
if($site_info->site_srl)
@ -962,7 +961,8 @@ class adminAdminModel extends admin
}
else
{
$icon_url = $db_info->default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
$default_url = Context::getDefaultUrl();
$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
}
return $icon_url;
}

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

@ -273,7 +273,6 @@ class adminAdminView extends admin
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'category_srl', 'title', 'nick_name', 'member_srl');
$args->list_count = 5;
;
$output = $oDocumentModel->getDocumentList($args, FALSE, FALSE, $columnList);
Context::set('latestDocumentList', $output->data);
unset($args, $output, $columnList);
@ -381,6 +380,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');
@ -436,7 +445,7 @@ class adminAdminView extends admin
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('module');
Context::set('siteTitle', $config->siteTitle);
Context::set('htmlFooter', $config->htmlFooter);
Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
// embed filter
require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
@ -515,7 +524,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 +536,6 @@ class adminAdminView extends admin
Context::addHtmlFooter($img);
}
FileHandler::removeDir($path);
FileHandler::writeFile($path . $mainVersion, '1');
unset($_SESSION['enviroment_gather']);
}

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

@ -1597,8 +1597,8 @@
<value xml:lang="jp"><![CDATA[HTMLタグを使用できます。]]></value>
</item>
<item name="sitelock_warning_whitelist">
<value xml:lang="ko"><![CDATA[이곳에 관리자의 IP를 반드시 포함해야 합니다.<br />만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => '<strong>Y</strong>'`를 `'use_sitelock' => '<strong>N</strong>'`으로 변경하여 차단을 해제할 수 있습니다.<br />사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html'이며<br />'./common/tpl/sitelock.user.html' 파일을 만들어서 디자인 파일을 편집하실 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[You should include the IP of the administrator here.<br />If the access is blocked, you can unbrick this by changing `'use_sitelock' => '<strong>Y</strong>'` to `'use_sitelock' => '<strong>N</strong>'` in './files/config/db.config.php.'<br />The file of site lock design is at './common/tpl/sitelock.html'.<br />You can modify design file by creating './common/tpl/sitelock.user.html'.]]></value>
<value xml:lang="ko"><![CDATA[이곳에 관리자의 IP를 반드시 포함해야 합니다.<br />만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => '<strong>Y</strong>'`를 `'use_sitelock' => '<strong>N</strong>'`으로 변경하여 차단을 해제할 수 있습니다.<br />사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html' 입니다.]]></value>
<value xml:lang="en"><![CDATA[You should include the IP of the administrator here.<br />If the access is blocked, you can unbrick this by changing `'use_sitelock' => '<strong>Y</strong>'` to `'use_sitelock' => '<strong>N</strong>'` in './files/config/db.config.php.'<br />The file of site lock design is at './common/tpl/sitelock.html.']]></value>
<value xml:lang="jp"><![CDATA[ここに管理者のIPを必ず記入てください。<br />もし接近が遮断された場合、'./files/config/db.config.php' ファイルから `'use_sitelock' => '<strong>Y</strong>'`を `'use_sitelock' => '<strong>N</strong>'`へ変更すれば遮断が解除できます。<br />サイトロックの設計ファイルの場所は、'./commo/tpl/sitelock.html' です。]]></value>
</item>
<item name="your_ip">

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" />