fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +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

2
modules/rss/lang/lang.xml
View file

@ -199,4 +199,4 @@
<value xml:lang="zh-TW"><![CDATA[錯誤的檔案格式，無法上傳。\n只允許上傳 JPEG, GIF, PNG 等檔案格式。]]></value>
<value xml:lang="ru"><![CDATA[Неправильный тип картинки\nПоддерживаются только JPEG, GIF, PNG файлы]]></value>
</item>
</lang>
</lang>

9
modules/rss/rss.admin.controller.php
View file

@ -119,6 +119,15 @@ class rssAdminController extends rss
$openTotalFeedList = $config_vars->open_total_feed;
$feedDescriptionList = $config_vars->feed_description;
$feedCopyrightList = $config_vars->feed_copyright;
$targetModuleSrl = $config_vars->target_module_srl;
if($targetModuleSrl && !is_array($openRssList))
{
$openRssList = array($targetModuleSrl => $openRssList);
$openTotalFeedList = array($targetModuleSrl => $openTotalFeedList);
$feedDescriptionList = array($targetModuleSrl => $feedDescriptionList);
$feedCopyrightList = array($targetModuleSrl => $feedCopyrightList);
}
if(is_array($openRssList))
{

2
modules/rss/rss.admin.view.php
View file

@ -27,7 +27,7 @@ class rssAdminView extends rss
$oModuleModel = &getModel('module');
$rss_config = $oModuleModel->getModulePartConfigs('rss');
$total_config = $oModuleModel->getModuleConfig('rss');
if(!$totla_config)
if(!$total_config)
{
$total_config =new stdClass();
}

5
modules/rss/ruleset/insertRssConfig.xml
View file

@ -7,7 +7,10 @@
<field name="module" required="true" default="rss" />
<field name="act" required="true" default="procRssAdminInsertConfig" />
<field name="use_total_feed" required="true" default="Y" rule="boolean" />
<field name="feed_title" required="true" />
<field name="feed_title" required="true">
<title xml:lang="ko">피드(Feed) 제목</title>
<title xml:lang="en">Feed Title</title>
</field>
<field name="feed_document_count" required="true" rule="number" default="15" />
</fields>
</ruleset>

20
modules/rss/tpl/rss_admin_index.html
View file

@ -1,7 +1,7 @@
<div class="x_page-header">
<h1>RSS <a class="x_icon-question-sign" href="./help/index.html#UMAN_content_rss" target="_blank">{$lang->help}</a></h1>
<h1>RSS <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_content_rss" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/rss/tpl/rss_admin_index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -9,6 +9,7 @@
<form ruleset="insertRssConfig" action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
<input type="hidden" name="module" value="rss" />
<input type="hidden" name="act" value="procRssAdminInsertConfig" />
<input type="hidden" name="xe_validator_id" value="modules/rss/tpl/rss_admin_index/1" />
<div class="x_control-group">
<div class="x_control-label">{$lang->url}</div>
<div class="x_controls" style="padding-top:5px"><a href="{getFullSiteUrl()}rss" target="_blank">{getFullSiteUrl()}rss</a></div>
@ -43,19 +44,9 @@
<!--@if($total_config->image)-->
<div class="_rss_image_container">
<!--
<img src="../../../{$total_config->image}" alt="image" />
<input type="checkbox" name="del_image" value="Y" id="del_image" />
<label for="del_image">{$lang->cmd_delete}</label>
-->
<div class="x_thumbnail" cond="$total_config->image" style="display:inline-block;margin:0 0 5px 0">
<img src="../../../{$total_config->image}" alt="image" style="max-width:210px;max-height:150px" />
<!--
<label for="del_image" class="x_caption" style="padding:5px 0 0 0;margin:0"><input type="checkbox" name="del_image" value="Y" id="del_image" /> {$lang->cmd_delete}</label>
-->
<input type="button" class="_delete_rss_image" value="{$lang->cmd_delete}" />
<input type="button" class="_delete_rss_image x_icon-remove" value="{$lang->cmd_delete}" style="width:14px" />
</div>
</div>
@ -72,7 +63,7 @@
<div class="x_control-group">
<label class="x_control-label" for="feed_document_count">{$lang->feed_document_count}</label>
<div class="x_controls">
<input type="number" min="1" max="100" name="feed_document_count" value="{$total_config->feed_document_count}" id="feed_document_count" style="width:50px" />
<input type="number" min="1" max="100" name="feed_document_count" value="{$total_config->feed_document_count}" id="feed_document_count" />
</div>
</div>
<div class="btnArea x_clearfix">
@ -85,6 +76,7 @@
<form action="./" method="post">
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
<input type="hidden" name="xe_validator_id" value="modules/rss/tpl/rss_admin_index/1" />
<table class="x_table x_table-striped x_table-hover" style="border-top:0;margin-top:0">
<thead>
<tr>