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

Close Connection when there is no connection value.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2013-09-25 15:29:32 +00:00
parent 034a5c0288
commit f70ce644ce
1410 changed files with 7188 additions and 53541 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/page/conf/module.xml
View file

@ -13,7 +13,6 @@
<action name="dispPageAdminGrantInfo" type="view" menu_name="page" />
<action name="dispPageAdminInfo" type="view" setup_index="true" menu_name="page" />
<action name="dispPageAdminPageAdditionSetup" type="view" menu_name="page" />
<action name="dispPageAdminInsert" type="view" menu_name="page" />
<action name="dispPageAdminDelete" type="view" standalone="true" />
<action name="dispPageAdminContentModify" type="view" standalone="true" />
<action name="dispPageAdminAddContent" type="view" standalone="true" />

3
modules/page/lang/lang.xml
View file

@ -168,4 +168,7 @@
<value xml:lang="en"><![CDATA[If you delete a page, the files of the page will be removed also.]]></value>
<value xml:lang="zh-TW"><![CDATA[如果刪除頁面，頁面標題將會一起被刪除。]]></value>
</item>
<item name="msg_not_selected_page">
<value xml:lang="ko"><![CDATA[선택한 페이지가 없습니다.]]></value>
</item>
</lang>

2
modules/page/page.admin.controller.php
View file

@ -193,7 +193,7 @@ class pageAdminController extends page
$this->add('page',Context::get('page'));
$this->setMessage('success_deleted');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPageAdminContent');
$this->setRedirectUrl($returnUrl);
}

70
modules/page/page.admin.view.php
View file

@ -61,16 +61,17 @@ class pageAdminView extends page
$search_target_list = array('s_mid','s_browser_title');
$search_target = Context::get('search_target');
$search_keyword = Context::get('search_keyword');
if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
$output = executeQuery('page.getPageList', $args);
$oModuleModel = &getModel('module');
$page_list = $oModuleModel->addModuleExtraVars($output->data);
moduleModel::syncModuleToSite($page_list);
$oModuleAdminModel = &getAdminModel('module');
$oModuleAdminModel = &getAdminModel('module'); /* @var $oModuleAdminModel moduleAdminModel */
$tabChoice = array('tab1'=>1, 'tab3'=>1);
$selected_manage_content = $oModuleAdminModel->getSelectedManageHTML($this->xml_info->grant, $tabChoice);
$selected_manage_content = $oModuleAdminModel->getSelectedManageHTML($this->xml_info->grant, $tabChoice, $this->module_path);
Context::set('selected_manage_content', $selected_manage_content);
// To write to a template context:: set
@ -79,6 +80,7 @@ class pageAdminView extends page
Context::set('page', $output->page);
Context::set('page_list', $output->data);
Context::set('page_navigation', $output->page_navigation);
//Security
$security = new Security();
$security->encodeHTML('page_list..browser_title');
@ -156,60 +158,14 @@ class pageAdminView extends page
$security->encodeHTML('module_info.');
}
/**
* @brief Add Page Form Output
*/
function dispPageAdminInsert()
{
// Get module_srl by GET parameter
$module_srl = Context::get('module_srl');
// Get and set module information if module_srl exists
if($module_srl)
{
$oModuleModel = &getModel('module');
$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title', 'layout_srl', 'use_mobile', 'mlayout_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
else
{
unset($module_info);
unset($module_srl);
}
}
// Get a layout list
$oLayoutModel = &getModel('layout');
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
Context::set('mlayout_list', $mobile_layout_list);
$oModuleModel = &getModel('module');
$skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list',$skin_list);
$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
Context::set('mskin_list', $mskin_list);
//Security
$security = new Security();
$security->encodeHTML('layout_list..layout');
$security->encodeHTML('layout_list..title');
$security->encodeHTML('mlayout_list..layout');
$security->encodeHTML('mlayout_list..title');
// Set a template file
$this->setTemplateFile('page_insert');
}
function dispPageAdminMobileContent()
function dispPageAdminMobileContent()
{
if($this->module_info->page_type == 'OUTSIDE')
{
return $this->stop(-1, 'msg_invalid_request');
}
if($this->module_srl)
if($this->module_srl)
{
Context::set('module_srl',$this->module_srl);
}
@ -238,7 +194,7 @@ class pageAdminView extends page
$this->setTemplateFile('mcontent');
}
function dispPageAdminMobileContentModify()
function dispPageAdminMobileContentModify()
{
Context::set('module_info', $this->module_info);
@ -270,7 +226,7 @@ class pageAdminView extends page
}
}
function _setWidgetTypeContentModify($isMobile = false)
function _setWidgetTypeContentModify($isMobile = false)
{
// Setting contents
if($isMobile)
@ -288,7 +244,7 @@ class pageAdminView extends page
Context::set('content', $content);
// Convert them to teach the widget
$oWidgetController = &getController('widget');
$oWidgetController = getController('widget');
$content = $oWidgetController->transWidgetCode($content, true, !$isMobile);
// $content = str_replace('$', '&#36;', $content);
Context::set('page_content', $content);
@ -305,7 +261,7 @@ class pageAdminView extends page
$this->setTemplateFile($templateFile);
}
function _setArticleTypeContentModify($isMobile = false)
function _setArticleTypeContentModify($isMobile = false)
{
$oDocumentModel = &getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
@ -327,6 +283,10 @@ class pageAdminView extends page
$oDocument->setDocument($document_srl);
Context::set('document_srl', $document_srl);
}
else
{
$oDocument->add('module_srl', $this->module_info->module_srl);
}
Context::addJsFilter($this->module_path.'tpl/filter', 'insert_article.xml');
Context::set('oDocument', $oDocument);

2
modules/page/tpl/header.html
View file

@ -3,7 +3,7 @@
<h1>
{$lang->page_management}
<span class="path" cond="$module_info->mid">
&gt; <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" target="_blank">{$module_info->mid}</a><block cond="$module_info->is_default=='Y'">({$lang->is_default})</block>
&gt; <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" target="_blank"|cond="$module=='admin'">{$module_info->mid}</a><block cond="$module_info->is_default=='Y'">({$lang->is_default})</block>
</span>
<a href="#aboutPage" class="x_icon-question-sign" data-toggle cond="!$module_info->mid"></a>
</h1>

35
modules/page/tpl/index.html
View file

@ -1,25 +1,40 @@
<load target="js/page_admin.js" usecdn="true" />
<include target="header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/module/tpl/manage_selected'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<!-- 검색 -->
<form action="./" method="get" class="search x_input-append x_pull-right" style="margin-bottom:-28px">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="vid" value="{$vid}" />
<input type="hidden" name="act" value="dispPageAdminContent" />
<select name="module_category_srl" title="{$lang->module_category}" style="margin-right:4px">
<option value="0" <!--@if($module_category_srl==="0")-->selected="selected"<!--@end-->>{$lang->not_exists}</option>
<!--@foreach($module_category as $key => $val)-->
<option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->
</select>
<select name="search_target" style="margin-right:4px">
<select name="search_target" id="search_target" style="margin-right:4px">
<option value="s_mid" selected="selected"|cond="$search_target=='s_mid'">{$lang->mid}</option>
<option value="s_browser_title" selected="selected"|cond="$search_target=='s_browser_title'">{$lang->browser_title}</option>
<option cond="$module_category">{$lang->module_category}</option>
</select>
<select name="module_category_srl" title="{$lang->module_category}" cond="$module_category" style="margin-right:4px">
<option loop="$module_category => $key,$val" value="{$key}" selected="selected"|cond="$module_category_srl==$key">{$val->title}</option>
</select>
<input type="search" name="search_keyword" title="Search" value="{htmlspecialchars($search_keyword)}" required style="width:150px" />
<button class="x_btn x_btn-inverse" type="submit">{$lang->cmd_search}</button>
<a href="{getUrl('','module',$module,'act',$act)}" class="x_btn">{$lang->cmd_cancel}</a>
</form>
<script>
jQuery(function($){
$('#search_target').change(function(){
var $this = $(this);
if($this.find('>option:last-child').is(':selected')){
$this.next('select').show().removeAttr('disabled').next('input[type="search"]').hide().attr('disabled','disabled');
} else {
$this.next('select').hide().attr('disabled','disabled').next('input[type="search"]').show().removeAttr('disabled');
}
}).change();
});
</script>
<!-- 목록 -->
<form action="./" method="get" id="fo_list">
@ -71,7 +86,7 @@
<div class="x_clearfix">
<div class="x_btn-group x_pull-right">
<a class="x_btn modalAnchor x_pull-right" href="#manageSelectedModule">{$lang->cmd_manage_selected_page}</a>
<a class="x_btn modalAnchor x_pull-right _manageSelected" href="#manageSelectedModule">{$lang->cmd_manage_selected_page}</a>
</div>
</div>
@ -125,7 +140,7 @@ jQuery(function($){
// Modal anchor activation
var $docTable = $('#fo_list>table');
$docTable.find(':checkbox').change(function(){
var $modalAnchor = $('a.modalAnchor');
var $modalAnchor = $('a.modalAnchor._manageSelected');
if($docTable.find('tbody :checked').length == 0){
$modalAnchor.removeAttr('href').addClass('x_disabled');
} else {
@ -136,7 +151,7 @@ jQuery(function($){
$('a.modalAnchor').click(function(){
if($docTable.find('tbody :checked').length == 0){
$('body').css('overflow','auto');
alert('{$lang->msg_not_selected_document}');
alert('{$lang->msg_not_selected_page}');
return false;
}
});

3
modules/page/tpl/page_delete.html
View file

@ -1,7 +1,7 @@
<load target="js/page_admin.js" usecdn="true" />
<!--#include("header.html")-->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/page/tpl/page_delete/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="deletePage" action="./" method="post">
@ -9,6 +9,7 @@
<input type="hidden" name="act" value="procPageAdminDelete" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
<input type="hidden" name="xe_validator_id" value="modules/page/tpl/page_delete/1" />
<section class="section">
<h2>{$lang->confirm_delete}</h2>
<p>{$lang->page_delete_warning}</p>

9
modules/page/tpl/page_info.html
View file

@ -1,5 +1,5 @@
<!--#include("header.html")-->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/page/tpl/page_info/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -9,6 +9,7 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="xe_validator_id" value="modules/page/tpl/page_info/1" />
<div class="x_control-group">
<label class="x_control-label">{$lang->page_type}</label>
<div class="x_controls" style="padding-top:4px">{$lang->page_type_name[$module_info->page_type]}</div>
@ -35,7 +36,7 @@
<div class="x_control-group">
<label class="x_control-label" for="lang_browser_title">{$lang->browser_title}</label>
<div class="x_controls">
<input type="text" name="browser_title" id="browser_title" value="{htmlspecialchars($module_info->browser_title)}" class="lang_code" />
<input type="text" name="browser_title" id="browser_title" value="<!--@if(strpos($module_info->browser_title, '$user_lang->') === false)-->{$module_info->browser_title}<!--@else-->{htmlspecialchars($module_info->browser_title)}<!--@end-->" class="lang_code" />
</div>
</div>
<div class="x_control-group">
@ -80,7 +81,7 @@
<div class="x_control-group" cond="$module_info->page_type == 'OUTSIDE'">
<label class="x_control-label" for="path">{$lang->opage_path}</label>
<div class="x_controls">
<input type="text" name="path" id="path" value="{htmlspecialchars($module_info->path)}" />
<input type="text" name="path" id="path" value="{$module_info->path}" />
<a href="#aboutOpagePath" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
<p class="x_help-block" id="aboutOpagePath" hidden>{$lang->about_opage_path}<b>{realpath("./")}</b></p>
</div>
@ -88,7 +89,7 @@
<div class="x_control-group" cond="$module_info->page_type == 'OUTSIDE'">
<label class="x_control-label" for="mpath">{$lang->opage_mobile_path}</label>
<div class="x_controls">
<input type="text" name="mpath" id="mpath" value="{htmlspecialchars($module_info->mpath)}" />
<input type="text" name="mpath" id="mpath" value="{$module_info->mpath}" />
<a href="#aboutOpageMobilePath" class="x_icon-question-sign" data-toggle>{$lang->help}</a>
<p class="x_help-block" id="aboutOpageMobilePath" hidden>{$lang->about_opage_mobile_path}<b>{realpath("./")}</b></p>
</div>

155
modules/page/tpl/page_insert.html
View file

@ -1,155 +0,0 @@
<!--%import("filter/insert_outside.xml")-->
<include target="header.html" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
<form ruleset="insertPage" action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
<input type="hidden" name="module" value="page" />
<input type="hidden" name="act" value="procPageAdminInsert" />
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<div class="x_control-group" cond="!$module_srl">
<label class="x_control-label" for="page_type">{$lang->page_type}</label>
<div class="x_controls">
<select name="page_type" id="page_type">
<option value="">{$lang->click_choice}</option>
<option value="WIDGET">{$lang->page_type_name['WIDGET']}</option>
<option value="ARTICLE">{$lang->page_type_name['ARTICLE']}</option>
<option value="OUTSIDE">{$lang->page_type_name['OUTSIDE']}</option>
</select>
<a href="#aboutPageType" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<div class="x_help-block" id="aboutPageType" hidden>{$lang->about_page_type}</div>
</div>
</div>
<input type="hidden" name="page_name" value="{$module_info->mid}" cond="$logged_info->is_admin !='Y'" />
<div class="x_control-group" cond="$logged_info->is_admin =='Y'">
<label class="x_control-label" for="page_name">{$lang->mid}</label>
<div class="x_controls">
<input type="text" name="page_name" id="page_name" value="{$module_info->mid}" />
<a href="#aboutMid" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutMid" hidden>{$lang->about_mid}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="module_category_srl">{$lang->module_category}</label>
<div class="x_controls">
<select name="module_category_srl" id="module_category_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$module_category => $key, $val" value="{$key}" selected="selected"|cond="$module_info->module_category_srl==$key">{$val->title}</option>
</select>
<a href="#aboutCategory" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutCategory" hidden>{$lang->about_module_category}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="lang_browser_title">{$lang->browser_title}</label>
<div class="x_controls">
<input type="text" name="browser_title" id="browser_title" value="{$module_info->browser_title}" class="lang_code"/>
<a href="#aboutBrowserTitle" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutBrowserTitle" hidden>{$lang->about_browser_title}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="layout_srl">{$lang->layout}</label>
<div class="x_controls">
<select name="layout_srl" id="layout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$layout_list => $key, $val" value="{$val->layout_srl}" selected="selected"|cond="$module_info->layout_srl==$val->layout_srl">{$val->title} ({$val->layout})</option>
</select>
<a href="#aboutLayout" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutLayout" hidden>{$lang->about_layout}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->mobile_view}</label>
<div class="x_controls">
<label for="use_mobile">
<input type="checkbox" name="use_mobile" id="use_mobile" value="Y" checked="checked"|cond="$module_info->use_mobile == 'Y'" />
{$lang->about_mobile_view}
</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="mlayout_srl">{$lang->mobile_layout}</label>
<div class="x_controls">
<select name="mlayout_srl" id="mlayout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$mlayout_list => $key, $val" value="{$val->layout_srl}" selected="selected"|cond="$module_info->mlayout_srl==$val->layout_srl">{$val->title} ({$val->layout})</option>
</select>
<a href="#aboutMobileLayout" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutMobileLayout" hidden>{$lang->about_layout}</p>
</div>
</div>
<div class="x_control-group optionnalData widgetType outsideType">
<label class="x_control-label" for="page_caching_interval">{$lang->page_caching_interval}</label>
<div class="x_controls">
<input type="text" name="page_caching_interval" id="page_caching_interval" value="{(int)$module_info->caching_interval}" /> {$lang->unit_min}
<a href="#aboutCaching" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutCaching" hidden>{$lang->about_page_caching_interval}</p>
</div>
</div>
<div class="x_control-group optionnalData articleType">
<label class="x_control-label">{$lang->skin_fix}</label>
<div class="x_controls">
<label for="is_skin_fix">
<input type="checkbox" name="is_skin_fix" id="is_skin_fix" value="Y" />
{$lang->about_skin_fix}
</label>
</div>
</div>
<div class="x_control-group optionnalData articleType">
<label class="x_control-label" for="skin">{$lang->skin}</label>
<div class="x_controls">
<select name="skin" id="skin">
<option loop="$skin_list => $key, $val" value="{$key}" selected="selected"|cond="$module_info->skin==$key ||(!$module_info->skin && $key=='default')">{$val->title}</option>
</select>
<a href="#aboutSkin" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutSkin" hidden>{$lang->about_skin}</p>
</div>
</div>
<div class="x_control-group optionnalData articleType">
<label class="x_control-label" for="mskin">{$lang->mobile_skin}</label>
<div class="x_controls">
<select name="mskin" id="mskin">
<option loop="$mskin_list => $key, $val" value="{$key}" selected="selected"|cond="$module_info->mskin==$key ||(!$module_info->mskin && $key=='default')">{$val->title}</option>
</select>
<a href="#aboutMobileSkin" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutMobileSkin" hidden>{$lang->about_skin}</p>
</div>
</div>
<div class="x_control-group row optionnalData outsideType">
<label class="x_control-label" for="path">{$lang->opage_path}</label>
<div class="x_controls">
<input type="text" name="path" id="path" value="{htmlspecialchars($module_info->path)}" />
<a href="#aboutOpage" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutOpage" hidden>{$lang->about_opage_path} <mark>{realpath("./")}</mark></p>
</div>
</div>
<div class="x_control-group row optionnalData outsideType">
<label class="x_control-label" for="mpath">{$lang->opage_mobile_path}</label>
<div class="x_controls">
<input type="text" name="mpath" id="mpath" value="{htmlspecialchars($module_info->mpath)}" />
<a href="#aboutOpageMobile" data-toggle class="x_icon-question-sign">{$lang->help}</a>
<p class="x_help-block" id="aboutOpageMobile" hidden>{$lang->about_opage_mobile_path} <mark>{realpath("./")}</mark></p>
</div>
</div>
<div class="x_clearfix btnArea">
<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_make}</button>
</div>
</form>
</section>
<script>
(function($){
$('.optionnalData').hide();
$('select[name=page_type]').change(function(){
$('.optionnalData').hide();
var select = $('select[name=page_type] :selected').val();
if(select != ""){
$('.'+select.toLowerCase()+'Type').show();
}
});
})(jQuery);
</script>